diff --git a/app/Console/Commands/UserAdmin.php b/app/Console/Commands/UserAdmin.php
index efdfbdce8..8a485c52b 100644
--- a/app/Console/Commands/UserAdmin.php
+++ b/app/Console/Commands/UserAdmin.php
@@ -39,7 +39,11 @@ class UserAdmin extends Command
     public function handle()
     {
         $id = $this->argument('id');
-        $user = User::whereUsername($id)->orWhere('id', $id)->first();
+        if(ctype_digit($id) == true) {
+            $user = User::find($id);
+        } else {
+            $user = User::whereUsername($id)->first();
+        }
         if(!$user) {
             $this->error('Could not find any user with that username or id.');
             exit;
diff --git a/app/Console/Commands/UserShow.php b/app/Console/Commands/UserShow.php
index d72bf8236..f572f731b 100644
--- a/app/Console/Commands/UserShow.php
+++ b/app/Console/Commands/UserShow.php
@@ -39,7 +39,11 @@ class UserShow extends Command
     public function handle()
     {
         $id = $this->argument('id');
-        $user = User::whereUsername($id)->orWhere('id', $id)->first();
+        if(ctype_digit($id) == true) {
+            $user = User::find($id);
+        } else {
+            $user = User::whereUsername($id)->first();
+        }
         if(!$user) {
             $this->error('Could not find any user with that username or id.');
             exit;
diff --git a/app/Console/Commands/UserSuspend.php b/app/Console/Commands/UserSuspend.php
index 17d44d2d5..5224932de 100644
--- a/app/Console/Commands/UserSuspend.php
+++ b/app/Console/Commands/UserSuspend.php
@@ -39,7 +39,11 @@ class UserSuspend extends Command
     public function handle()
     {
         $id = $this->argument('id');
-        $user = User::whereUsername($id)->orWhere('id', $id)->first();
+        if(ctype_digit($id) == true) {
+            $user = User::find($id);
+        } else {
+            $user = User::whereUsername($id)->first();
+        }
         if(!$user) {
             $this->error('Could not find any user with that username or id.');
             exit;
diff --git a/app/Console/Commands/UserUnsuspend.php b/app/Console/Commands/UserUnsuspend.php
index afb6dee6a..8a9d039e9 100644
--- a/app/Console/Commands/UserUnsuspend.php
+++ b/app/Console/Commands/UserUnsuspend.php
@@ -39,7 +39,11 @@ class UserUnsuspend extends Command
     public function handle()
     {
         $id = $this->argument('id');
-        $user = User::whereUsername($id)->orWhere('id', $id)->first();
+        if(ctype_digit($id) == true) {
+            $user = User::find($id);
+        } else {
+            $user = User::whereUsername($id)->first();
+        }
         if(!$user) {
             $this->error('Could not find any user with that username or id.');
             exit;