diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php
index 5e89320062f6..460020db838b 100644
--- a/app/Http/Controllers/ClientPortal/InvitationController.php
+++ b/app/Http/Controllers/ClientPortal/InvitationController.php
@@ -55,13 +55,10 @@ class InvitationController extends Controller
         /* Return early if we have the correct client_hash embedded */
 
         if (request()->has('client_hash') && request()->input('client_hash') == $invitation->contact->client->client_hash) {
-            nlog("scenario 1");
             auth()->guard('contact')->login($invitation->contact, true);
         } elseif ((bool) $invitation->contact->client->getSetting('enable_client_portal_password') !== false) {
-            nlog("scenario 2");
             $this->middleware('auth:contact');
         } else {
-            nlog("scenario 3");
             auth()->guard('contact')->login($invitation->contact, true);
         }
 
diff --git a/app/Models/ClientContact.php b/app/Models/ClientContact.php
index bb759a8738a1..83907c39532c 100644
--- a/app/Models/ClientContact.php
+++ b/app/Models/ClientContact.php
@@ -87,6 +87,12 @@ class ClientContact extends Authenticatable implements HasLocalePreference
         'client_id',
     ];
 
+    /* Changing the username to id allows us to login() a contact that doesn't have an email address set*/
+    public function username()
+    {
+        return 'id';
+    }
+
     public function getEntityType()
     {
         return self::class;
diff --git a/app/Repositories/ClientContactRepository.php b/app/Repositories/ClientContactRepository.php
index b53de62ed3fa..ea574f52061c 100644
--- a/app/Repositories/ClientContactRepository.php
+++ b/app/Repositories/ClientContactRepository.php
@@ -76,6 +76,7 @@ class ClientContactRepository extends BaseRepository
             $new_contact->client_id = $client->id;
             $new_contact->contact_key = Str::random(40);
             $new_contact->is_primary = true;
+            $new_contact->confirmed = true;
             $new_contact->save();
         }
     }