diff --git a/app/Console/Commands/CreateAccount.php b/app/Console/Commands/CreateAccount.php
index 03dfd93265b..d694369bb8b 100644
--- a/app/Console/Commands/CreateAccount.php
+++ b/app/Console/Commands/CreateAccount.php
@@ -2,8 +2,6 @@
 
 namespace App\Console\Commands;
 
-use function Safe\touch;
-use App\Helpers\InstanceHelper;
 use App\Models\Account\Account;
 use Illuminate\Console\Command;
 
@@ -34,13 +32,15 @@ public function handle()
     {
         $email = $this->option('email');
         if (empty($email)) {
-            $this.error('! You must specify an email');
-            return;
+            $this->error('! You must specify an email');
         }
-        
+
         $password = $this->option('password');
         if (empty($password)) {
-            $this.error('! You must specify a password');
+            $this->error('! You must specify a password');
+        }
+
+        if (empty($email) || empty($password)) {
             return;
         }
 
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 92bf6e5034d..1991738e4a9 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -3,7 +3,6 @@
 namespace App\Console;
 
 use App\Console\Commands\Clean;
-use App\Console\Commands\CreateAccount;
 use App\Console\Commands\Update;
 use App\Console\Commands\Passport;
 use App\Console\Commands\ExportAll;
@@ -14,6 +13,7 @@
 use App\Console\Commands\ImportVCards;
 use App\Console\Commands\LangGenerate;
 use App\Console\Commands\SetUserAdmin;
+use App\Console\Commands\CreateAccount;
 use App\Console\Commands\Deactivate2FA;
 use App\Console\Commands\SendReminders;
 use App\Console\Commands\SendTestEmail;