diff --git a/app/Console/Commands/InviteFromWaitlist.php b/app/Console/Commands/InviteFromWaitlist.php
index 4adc60693..2794b7441 100644
--- a/app/Console/Commands/InviteFromWaitlist.php
+++ b/app/Console/Commands/InviteFromWaitlist.php
@@ -19,21 +19,29 @@ class InviteFromWaitlist extends Command
      *
      * @var string
      */
-    protected $signature = 'app:invite-from-waitlist';
+    protected $signature = 'app:invite-from-waitlist {email?}';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Send invitation to the next user in the waitlist';
+    protected $description = 'Send invitation to the next user (or by email) in the waitlist';
 
     /**
      * Execute the console command.
      */
     public function handle()
     {
-        $this->next_patient = Waitlist::orderBy('created_at', 'asc')->where('verified', true)->first();
+        if ($this->argument('email')) {
+            $this->next_patient = Waitlist::where('email', $this->argument('email'))->first();
+            if (!$this->next_patient) {
+                $this->error("{$this->argument('email')} not found in the waitlist.");
+                return;
+            }
+        } else {
+            $this->next_patient = Waitlist::orderBy('created_at', 'asc')->where('verified', true)->first();
+        }
         if ($this->next_patient) {
             $this->register_user();
             $this->remove_from_waitlist();
diff --git a/config/version.php b/config/version.php
index 7764582fa..7ea9c5731 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.20';
+return '4.0.0-beta.21';
diff --git a/versions.json b/versions.json
index 2efda3c64..5215932b7 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
       "version": "3.12.36"
     },
     "v4": {
-      "version": "4.0.0-beta.19"
+      "version": "4.0.0-beta.20"
     }
   }
 }