diff --git a/app/Http/Controllers/ClientPortal/SwitchCompanyController.php b/app/Http/Controllers/ClientPortal/SwitchCompanyController.php
index 627dd6e18d..2867541476 100644
--- a/app/Http/Controllers/ClientPortal/SwitchCompanyController.php
+++ b/app/Http/Controllers/ClientPortal/SwitchCompanyController.php
@@ -27,7 +27,7 @@ class SwitchCompanyController extends Controller
             ->where('id', $this->transformKeys($contact))
             ->first();
 
-        Auth::guard('contact')->login($client_contact, true);
+        auth()->guard('contact')->user()->login($client_contact, true);
 
         return redirect('/client/dashboard');
     }
diff --git a/app/Mail/Admin/EntityViewedObject.php b/app/Mail/Admin/EntityViewedObject.php
index 90a7588eee..4c1004aabb 100644
--- a/app/Mail/Admin/EntityViewedObject.php
+++ b/app/Mail/Admin/EntityViewedObject.php
@@ -42,6 +42,9 @@ class EntityViewedObject
     public function build()
     {
 
+        if(!$this->entity)
+            return;
+
         App::forgetInstance('translator');
         /* Init a new copy of the translator*/
         $t = app('translator');