diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 79726b5b21b2..e0940531aac2 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -309,10 +309,6 @@ class BaseController extends Controller
             },
             'company.tax_rates' => function ($query) use ($updated_at, $user) {
                 $query->where('updated_at', '>=', $updated_at);
-
-                if(!$user->isAdmin())
-                  $query->where('tax_rates.user_id', $user->id);
-
             },
             'company.vendors'=> function ($query) use ($updated_at, $user) {
                 $query->where('updated_at', '>=', $updated_at)->with('contacts', 'documents');
@@ -323,15 +319,9 @@ class BaseController extends Controller
             },
             'company.expense_categories'=> function ($query) use ($updated_at, $user) {
                 $query->where('updated_at', '>=', $updated_at);
-
-                if(!$user->isAdmin())
-                  $query->where('expense_categories.user_id', $user->id);
-
             },
             'company.task_statuses'=> function ($query) use ($updated_at, $user) {
                 $query->where('updated_at', '>=', $updated_at);
-
-
             },
             'company.activities'=> function ($query) use($user) {
 
diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php
index 5d081743037f..ff38ab69a8df 100644
--- a/app/Http/Controllers/ClientPortal/InvitationController.php
+++ b/app/Http/Controllers/ClientPortal/InvitationController.php
@@ -57,7 +57,7 @@ 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) {
-            auth()->guard('contact')->login($invitation->contact, true);
+            auth()->guard('contact')->loginUsingId($invitation->contact->id, true);
 
         } elseif ((bool) $invitation->contact->client->getSetting('enable_client_portal_password') !== false) {
 
@@ -66,7 +66,7 @@ class InvitationController extends Controller
             return redirect()->route('client.login');
 
         } else {
-            auth()->guard('contact')->login($invitation->contact, true);
+            auth()->guard('contact')->loginUsingId($invitation->contact->id, true);
         }
 
 
diff --git a/app/Http/Middleware/ContactKeyLogin.php b/app/Http/Middleware/ContactKeyLogin.php
index 4ababf873a0b..8d2b4b02a175 100644
--- a/app/Http/Middleware/ContactKeyLogin.php
+++ b/app/Http/Middleware/ContactKeyLogin.php
@@ -18,6 +18,7 @@ use Auth;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Str;
 
 class ContactKeyLogin
 {
@@ -42,6 +43,9 @@ class ContactKeyLogin
             if (MultiDB::findAndSetDbByContactKey($request->segment(3))) {
 
             if($client_contact = ClientContact::where('contact_key', $request->segment(3))->first()){
+                if(empty($client_contact->email))
+                    $client_contact->email = Str::random(6) . "@example.com"; $client_contact->save();
+
                 Auth::guard('contact')->login($client_contact, true);
                 return redirect()->to('client/dashboard');
              }
@@ -49,6 +53,10 @@ class ContactKeyLogin
             }
         } elseif ($request->segment(2) && $request->segment(2) == 'key_login' && $request->segment(3)) {
             if ($client_contact = ClientContact::where('contact_key', $request->segment(3))->first()) {
+  
+                  if(empty($client_contact->email))
+                    $client_contact->email = Str::random(6) . "@example.com"; $client_contact->save();
+    
                 auth()->guard('contact')->login($client_contact, true);
                 return redirect()->to('client/dashboard');
             }
@@ -56,19 +64,36 @@ class ContactKeyLogin
             if (MultiDB::findAndSetDbByClientHash($request->input('client_hash'))) {
 
                 if($client = Client::where('client_hash', $request->input('client_hash'))->first()){
-                    auth()->guard('contact')->login($client->primary_contact()->first(), true);
+        
+                $primary_contact = $client->primary_contact()->first();
+
+                if(empty($primary_contact->email))
+                    $primary_contact->email = Str::random(6) . "@example.com"; $primary_contact->save();
+
+                    auth()->guard('contact')->login($primary_contact, true);
                     return redirect()->to('client/dashboard');
                 }
             }
         } elseif ($request->has('client_hash')) {
             if ($client = Client::where('client_hash', $request->input('client_hash'))->first()) {
-                Auth::guard('contact')->login($client->primary_contact()->first(), true);
+
+                $primary_contact = $client->primary_contact()->first();
+                
+                if(empty($primary_contact->email))
+                    $primary_contact->email = Str::random(6) . "@example.com"; $primary_contact->save();
+
+                    auth()->guard('contact')->login($primary_contact, true);
+
                 return redirect()->to('client/dashboard');
             }
         } elseif ($request->segment(2) && $request->segment(2) == 'magic_link' && $request->segment(3)) {
             $contact_email = Cache::get($request->segment(3));
             if($client_contact = ClientContact::where('email', $contact_email)->first()){
-                Auth::guard('contact')->login($client_contact, true);
+               
+                 if(empty($client_contact->email))
+                    $client_contact->email = Str::random(6) . "@example.com"; $client_contact->save();
+    
+                auth()->guard('contact')->login($client_contact, true);
 
                 if ($request->query('redirect') && !empty($request->query('redirect'))) {
                     return redirect()->to($request->query('redirect'));
diff --git a/app/Mail/SupportMessageSent.php b/app/Mail/SupportMessageSent.php
index b826cf7f42f5..197782f96f57 100644
--- a/app/Mail/SupportMessageSent.php
+++ b/app/Mail/SupportMessageSent.php
@@ -60,7 +60,7 @@ class SupportMessageSent extends Mailable
         $subject = "Customer MSG {$user->present()->name} - [{$plan} - DB:{$company->db}]";
 
         return $this->from(config('mail.from.address'), config('mail.from.name')) 
-                ->replyTo($user, $user->present()->name())
+                ->replyTo($user->email, $user->present()->name())
                 ->subject($subject)
                 ->markdown('email.support.message', [
                     'message' => $this->message,