diff --git a/src/commands/give.ts b/src/commands/give.ts
index ebdebe4..3ffbe8f 100644
--- a/src/commands/give.ts
+++ b/src/commands/give.ts
@@ -77,7 +77,7 @@ export default class Give extends Command {
         }
 
         const cardNumber = interaction.options.get("cardnumber", true);
-        const user = interaction.options.getUser("user", true);
+        const user = interaction.options.get("user", true).user!;
 
         AppLogger.LogSilly("Commands/Give/GiveCard", `Parameters: cardNumber=${cardNumber.value}, user=${user.id}`);
 
@@ -103,7 +103,7 @@ export default class Give extends Command {
 
     private async GiveCurrency(interaction: CommandInteraction) {
         const amount = interaction.options.get("amount", true);
-        const user = interaction.options.getUser("user", true);
+        const user = interaction.options.get("user", true).user!;
 
         AppLogger.LogSilly("Commands/Give/GiveCurrency", `Parameters: amount=${amount.value} user=${user.id}`);
 
diff --git a/src/commands/inventory.ts b/src/commands/inventory.ts
index 7d77764..217cb63 100644
--- a/src/commands/inventory.ts
+++ b/src/commands/inventory.ts
@@ -22,7 +22,9 @@ export default class Inventory extends Command {
 
     public override async execute(interaction: CommandInteraction) {
         const page = interaction.options.get("page");
-        const user = interaction.options.getUser("user") || interaction.user;
+        const userOption = interaction.options.get("user");
+
+        const user = userOption ? userOption.user! : interaction.user;
 
         AppLogger.LogSilly("Commands/Inventory", `Parameters: page=${page?.value}, user=${user.id}`);
 
diff --git a/src/commands/trade.ts b/src/commands/trade.ts
index 3324128..a59ffe5 100644
--- a/src/commands/trade.ts
+++ b/src/commands/trade.ts
@@ -30,9 +30,9 @@ export default class Trade extends Command {
     }
 
     public override async execute(interaction: CommandInteraction) {
-        const user = interaction.options.getUser("user")!;
-        const give = interaction.options.get("give")!;
-        const receive = interaction.options.get("receive")!;
+        const user = interaction.options.get("user", true).user!;
+        const give = interaction.options.get("give", true);
+        const receive = interaction.options.get("receive", true);
 
         AppLogger.LogSilly("Commands/Trade", `Parameters: user=${user.id}, give=${give.value}, receive=${receive.value}`);