diff --git a/app/Filters/CreditFilters.php b/app/Filters/CreditFilters.php
index b3b11e62dcf3..6cf8ec194772 100644
--- a/app/Filters/CreditFilters.php
+++ b/app/Filters/CreditFilters.php
@@ -163,7 +163,7 @@ class CreditFilters extends QueryFilters
      */
     public function entityFilter()
     {
-        if (auth('contact')->user()) {
+        if (auth()->guard('contact')->user()) {
             return $this->contactViewFilter();
         } else {
             return $this->builder->company();
@@ -181,7 +181,7 @@ class CreditFilters extends QueryFilters
     private function contactViewFilter() : Builder
     {
         return $this->builder
-                    ->whereCompanyId(auth('contact')->user()->company->id)
+                    ->whereCompanyId(auth()->guard('contact')->user()->company->id)
                     ->whereNotIn('status_id', [Credit::STATUS_DRAFT]);
     }
 }
diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php
index 6a37b29ae8bd..1a85c6d1af30 100644
--- a/app/Filters/InvoiceFilters.php
+++ b/app/Filters/InvoiceFilters.php
@@ -177,7 +177,7 @@ class InvoiceFilters extends QueryFilters
      */
     public function entityFilter()
     {
-        if (auth('contact')->user()) {
+        if (auth()->guard('contact')->user()) {
             return $this->contactViewFilter();
         } else {
             return $this->builder->company()->with(['invitations.company'], ['documents.company']);
@@ -195,7 +195,7 @@ class InvoiceFilters extends QueryFilters
     private function contactViewFilter() : Builder
     {
         return $this->builder
-                    ->whereCompanyId(auth('contact')->user()->company->id)
+                    ->whereCompanyId(auth()->guard('contact')->user()->company->id)
                     ->whereNotIn('status_id', [Invoice::STATUS_DRAFT, Invoice::STATUS_CANCELLED]);
     }
 }
diff --git a/app/Filters/PaymentFilters.php b/app/Filters/PaymentFilters.php
index c7000febaa97..f5c2ba42e500 100644
--- a/app/Filters/PaymentFilters.php
+++ b/app/Filters/PaymentFilters.php
@@ -119,7 +119,7 @@ class PaymentFilters extends QueryFilters
      */
     public function entityFilter()
     {
-        if (auth('contact')->user()) {
+        if (auth()->guard('contact')->user()) {
             return $this->contactViewFilter();
         } else {
             return $this->builder->company();
@@ -135,7 +135,7 @@ class PaymentFilters extends QueryFilters
     private function contactViewFilter() : Builder
     {
         return $this->builder
-                    ->whereCompanyId(auth('contact')->user()->company->id)
+                    ->whereCompanyId(auth()->guard('contact')->user()->company->id)
                     ->whereIsDeleted(false);
     }
 }
diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php
index 32d1289b5441..28d9f7300b0b 100644
--- a/app/Filters/QueryFilters.php
+++ b/app/Filters/QueryFilters.php
@@ -161,8 +161,8 @@ abstract class QueryFilters
      */
     public function clientFilter()
     {
-        if (auth('contact')->user()) {
-            return $this->builder->whereClientId(auth('contact')->user()->client->id);
+        if (auth()->guard('contact')->user()) {
+            return $this->builder->whereClientId(auth()->guard('contact')->user()->client->id);
         }
     }
 
diff --git a/app/Http/Controllers/ClientPortal/DocumentController.php b/app/Http/Controllers/ClientPortal/DocumentController.php
index 0b78238236c2..f24615f13618 100644
--- a/app/Http/Controllers/ClientPortal/DocumentController.php
+++ b/app/Http/Controllers/ClientPortal/DocumentController.php
@@ -71,7 +71,7 @@ class DocumentController extends Controller
     public function downloadMultiple(DownloadMultipleDocumentsRequest $request)
     {
         $documents = Document::whereIn('id', $this->transformKeys($request->file_hash))
-            ->where('company_id', auth('contact')->user()->company->id)
+            ->where('company_id', auth()->guard('contact')->user()->company->id)
             ->get();
 
         $documents->map(function ($document) {
diff --git a/app/Http/Controllers/ClientPortal/NinjaPlanController.php b/app/Http/Controllers/ClientPortal/NinjaPlanController.php
index 2e109d39bf46..985ee7c644f7 100644
--- a/app/Http/Controllers/ClientPortal/NinjaPlanController.php
+++ b/app/Http/Controllers/ClientPortal/NinjaPlanController.php
@@ -100,7 +100,7 @@ class NinjaPlanController extends Controller
                 }
 
                 $recurring_invoice =  RecurringInvoice::on('db-ninja-01')
-                                            ->where('client_id', auth('contact')->user()->client->id)
+                                            ->where('client_id', auth()->guard('contact')->user()->client->id)
                                             ->where('company_id', Auth::guard('contact')->user()->company->id)
                                             ->whereNotNull('subscription_id')
                                             ->where('status_id', RecurringInvoice::STATUS_ACTIVE)
diff --git a/app/Http/Controllers/ClientPortal/PaymentMethodController.php b/app/Http/Controllers/ClientPortal/PaymentMethodController.php
index f7a3da2728d5..ea16b2326d1f 100644
--- a/app/Http/Controllers/ClientPortal/PaymentMethodController.php
+++ b/app/Http/Controllers/ClientPortal/PaymentMethodController.php
@@ -130,7 +130,7 @@ class PaymentMethodController extends Controller
 
         try {
 
-            event(new MethodDeleted($payment_method, auth('contact')->user()->company, Ninja::eventVars(auth('contact')->user()->id)));
+            event(new MethodDeleted($payment_method, auth()->guard('contact')->user()->company, Ninja::eventVars(auth()->guard('contact')->user()->id)));
             
             $payment_method->delete();
 
diff --git a/app/Http/Controllers/ClientPortal/QuoteController.php b/app/Http/Controllers/ClientPortal/QuoteController.php
index c527d7b7fd46..fec64c9b411e 100644
--- a/app/Http/Controllers/ClientPortal/QuoteController.php
+++ b/app/Http/Controllers/ClientPortal/QuoteController.php
@@ -160,8 +160,8 @@ class QuoteController extends Controller
     protected function approve(array $ids, $process = false)
     {
         $quotes = Quote::whereIn('id', $ids)
-            ->where('client_id', auth('contact')->user()->client->id)
-            ->where('company_id', auth('contact')->user()->client->company_id)
+            ->where('client_id', auth()->guard('contact')->user()->client->id)
+            ->where('company_id', auth()->guard('contact')->user()->client->company_id)
             ->whereIn('status_id', [Quote::STATUS_DRAFT, Quote::STATUS_SENT])
             ->withTrashed()
             ->get();
@@ -175,7 +175,7 @@ class QuoteController extends Controller
         if ($process) {
             foreach ($quotes as $quote) {
                 $quote->service()->approve(auth()->user())->save();
-                event(new QuoteWasApproved(auth('contact')->user(), $quote, $quote->company, Ninja::eventVars()));
+                event(new QuoteWasApproved(auth()->guard('contact')->user(), $quote, $quote->company, Ninja::eventVars()));
 
                 if (request()->has('signature') && !is_null(request()->signature) && !empty(request()->signature)) {
                     InjectSignature::dispatch($quote, request()->signature);
diff --git a/app/Http/Controllers/ClientPortal/SubscriptionController.php b/app/Http/Controllers/ClientPortal/SubscriptionController.php
index e668299ab74a..861e95e4fbf8 100644
--- a/app/Http/Controllers/ClientPortal/SubscriptionController.php
+++ b/app/Http/Controllers/ClientPortal/SubscriptionController.php
@@ -26,8 +26,8 @@ class SubscriptionController extends Controller
 
 
             $count = RecurringInvoice::query()
-                ->where('client_id', auth('contact')->user()->client->id)
-                ->where('company_id', auth('contact')->user()->client->company_id)
+                ->where('client_id', auth()->guard('contact')->user()->client->id)
+                ->where('company_id', auth()->guard('contact')->user()->client->company_id)
                 ->where('status_id', RecurringInvoice::STATUS_ACTIVE)
                 ->where('is_deleted', 0)
                 ->whereNotNull('subscription_id')
@@ -35,7 +35,7 @@ class SubscriptionController extends Controller
                 ->count();
 
                 if($count == 0)
-                    return redirect()->route('client.ninja_contact_login', ['contact_key' => auth('contact')->user()->contact_key, 'company_key' => auth('contact')->user()->company->company_key]);
+                    return redirect()->route('client.ninja_contact_login', ['contact_key' => auth()->guard('contact')->user()->contact_key, 'company_key' => auth()->guard('contact')->user()->company->company_key]);
 
         }
 
diff --git a/app/Http/Controllers/ClientPortal/TaskController.php b/app/Http/Controllers/ClientPortal/TaskController.php
index 75d923952e9a..07fe73dcac7b 100644
--- a/app/Http/Controllers/ClientPortal/TaskController.php
+++ b/app/Http/Controllers/ClientPortal/TaskController.php
@@ -26,7 +26,7 @@ class TaskController extends Controller
     public function index(ShowTasksRequest $request)
     {
         \Carbon\Carbon::setLocale(
-            auth('contact')->user()->preferredLocale()
+            auth()->guard('contact')->user()->preferredLocale()
         );
 
         return render('tasks.index');
diff --git a/app/Http/Livewire/CreditsTable.php b/app/Http/Livewire/CreditsTable.php
index fe7f1f1487b2..60b0fe615d28 100644
--- a/app/Http/Livewire/CreditsTable.php
+++ b/app/Http/Livewire/CreditsTable.php
@@ -36,7 +36,7 @@ class CreditsTable extends Component
     {
 
         $query = Credit::query()
-            ->where('client_id', auth('contact')->user()->client->id)
+            ->where('client_id', auth()->guard('contact')->user()->client->id)
             ->where('company_id', $this->company->id)
             ->where('status_id', '<>', Credit::STATUS_DRAFT)
             ->where('is_deleted', 0)
diff --git a/app/Http/Livewire/InvoicesTable.php b/app/Http/Livewire/InvoicesTable.php
index 68351ecf5919..36bf35237512 100644
--- a/app/Http/Livewire/InvoicesTable.php
+++ b/app/Http/Livewire/InvoicesTable.php
@@ -75,7 +75,7 @@ class InvoicesTable extends Component
         }
 
         $query = $query
-            ->where('client_id', auth('contact')->user()->client->id)
+            ->where('client_id', auth()->guard('contact')->user()->client->id)
             ->where('status_id', '<>', Invoice::STATUS_DRAFT)
             ->where('status_id', '<>', Invoice::STATUS_CANCELLED)
             ->withTrashed()
diff --git a/app/Http/Livewire/PaymentsTable.php b/app/Http/Livewire/PaymentsTable.php
index 1493f37ef191..5c71579c461b 100644
--- a/app/Http/Livewire/PaymentsTable.php
+++ b/app/Http/Livewire/PaymentsTable.php
@@ -43,7 +43,7 @@ class PaymentsTable extends Component
             ->with('type', 'client')
             ->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment::STATUS_PENDING, Payment::STATUS_REFUNDED, Payment::STATUS_PARTIALLY_REFUNDED])
             ->where('company_id', $this->company->id)
-            ->where('client_id', auth('contact')->user()->client->id)
+            ->where('client_id', auth()->guard('contact')->user()->client->id)
             ->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc')
             ->withTrashed()
             ->paginate($this->per_page);
diff --git a/app/Http/Livewire/QuotesTable.php b/app/Http/Livewire/QuotesTable.php
index 1aa996f089d9..644ceca9b5a4 100644
--- a/app/Http/Livewire/QuotesTable.php
+++ b/app/Http/Livewire/QuotesTable.php
@@ -75,7 +75,7 @@ class QuotesTable extends Component
 
         $query = $query
             ->where('company_id', $this->company->id)
-            ->where('client_id', auth('contact')->user()->client->id)
+            ->where('client_id', auth()->guard('contact')->user()->client->id)
             ->where('status_id', '<>', Quote::STATUS_DRAFT)
             // ->where(function ($query){
             //     $query->whereDate('due_date', '>=', now())
diff --git a/app/Http/Livewire/RecurringInvoicesTable.php b/app/Http/Livewire/RecurringInvoicesTable.php
index 9eeda33d8582..b6fe09ea90ee 100644
--- a/app/Http/Livewire/RecurringInvoicesTable.php
+++ b/app/Http/Livewire/RecurringInvoicesTable.php
@@ -40,7 +40,7 @@ class RecurringInvoicesTable extends Component
         $query = RecurringInvoice::query();
 
         $query = $query
-            ->where('client_id', auth('contact')->user()->client->id)
+            ->where('client_id', auth()->guard('contact')->user()->client->id)
             ->where('company_id', $this->company->id)
             ->whereIn('status_id', [RecurringInvoice::STATUS_ACTIVE])
             ->orderBy('status_id', 'asc')
diff --git a/app/Http/Livewire/SubscriptionRecurringInvoicesTable.php b/app/Http/Livewire/SubscriptionRecurringInvoicesTable.php
index 3568ff8cf502..fcb56ddb9b87 100644
--- a/app/Http/Livewire/SubscriptionRecurringInvoicesTable.php
+++ b/app/Http/Livewire/SubscriptionRecurringInvoicesTable.php
@@ -35,7 +35,7 @@ class SubscriptionRecurringInvoicesTable extends Component
     public function render()
     {
         $query = RecurringInvoice::query()
-            ->where('client_id', auth('contact')->user()->client->id)
+            ->where('client_id', auth()->guard('contact')->user()->client->id)
             ->where('company_id', $this->company->id)
             ->whereNotNull('subscription_id')
             ->where('is_deleted', false)
diff --git a/app/Http/Livewire/TasksTable.php b/app/Http/Livewire/TasksTable.php
index 1e36c2eed654..872ce4b72ce9 100644
--- a/app/Http/Livewire/TasksTable.php
+++ b/app/Http/Livewire/TasksTable.php
@@ -37,7 +37,7 @@ class TasksTable extends Component
         $query = Task::query()
             ->where('company_id', $this->company->id)
             ->where('is_deleted', false)
-            ->where('client_id', auth('contact')->user()->client->id);
+            ->where('client_id', auth()->guard('contact')->user()->client->id);
 
         if ($this->company->getSetting('show_all_tasks_client_portal') === 'invoiced') {
             $query = $query->whereNotNull('invoice_id');
diff --git a/app/Http/Middleware/CheckClientExistence.php b/app/Http/Middleware/CheckClientExistence.php
index 554e74d8e6a1..f7aab8161afc 100644
--- a/app/Http/Middleware/CheckClientExistence.php
+++ b/app/Http/Middleware/CheckClientExistence.php
@@ -31,7 +31,7 @@ class CheckClientExistence
 
         $multiple_contacts = ClientContact::query()
             ->with('client.gateway_tokens','company')
-            ->where('email', auth('contact')->user()->email)
+            ->where('email', auth()->guard('contact')->user()->email)
             ->whereNotNull('email')
             ->where('email', '<>', '')
             // ->whereNull('deleted_at')
@@ -42,7 +42,7 @@ class CheckClientExistence
                 return $query->where('is_deleted', false);
             })
             ->whereHas('company', function ($query){
-                return $query->where('id', auth('contact')->user()->client->company_id);
+                return $query->where('id', auth()->guard('contact')->user()->client->company_id);
             })
             ->get();
 
diff --git a/app/Http/Middleware/Locale.php b/app/Http/Middleware/Locale.php
index d9f5513b8f16..e43d6d7ff7ee 100644
--- a/app/Http/Middleware/Locale.php
+++ b/app/Http/Middleware/Locale.php
@@ -32,8 +32,8 @@ class Locale
         if ($request->has('lang')) {
             $locale = $request->input('lang');
             App::setLocale($locale);
-        } elseif (auth('contact')->user()) {
-            App::setLocale(auth('contact')->user()->client->locale());
+        } elseif (auth()->guard('contact')->user()) {
+            App::setLocale(auth()->guard('contact')->user()->client->locale());
         } elseif (auth()->user()) {
 
             try{
diff --git a/app/Http/Requests/ClientPortal/Credits/ShowCreditRequest.php b/app/Http/Requests/ClientPortal/Credits/ShowCreditRequest.php
index 52b76a8d7321..432e22feda32 100644
--- a/app/Http/Requests/ClientPortal/Credits/ShowCreditRequest.php
+++ b/app/Http/Requests/ClientPortal/Credits/ShowCreditRequest.php
@@ -15,7 +15,7 @@ class ShowCreditRequest extends FormRequest
     public function authorize()
     {
         return !$this->credit->is_deleted
-            && auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS;
+            && auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS;
     }
 
     /**
diff --git a/app/Http/Requests/ClientPortal/Credits/ShowCreditsRequest.php b/app/Http/Requests/ClientPortal/Credits/ShowCreditsRequest.php
index 2cff1b9014fb..bf0cc0334663 100644
--- a/app/Http/Requests/ClientPortal/Credits/ShowCreditsRequest.php
+++ b/app/Http/Requests/ClientPortal/Credits/ShowCreditsRequest.php
@@ -19,7 +19,7 @@ class ShowCreditsRequest extends FormRequest
 {
     public function authorize()
     {
-        return auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS;
+        return auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS;
     }
 
     public function rules()
diff --git a/app/Http/Requests/ClientPortal/Invoices/ProcessInvoicesInBulkRequest.php b/app/Http/Requests/ClientPortal/Invoices/ProcessInvoicesInBulkRequest.php
index e3d9ae96b56c..e341214e8daf 100644
--- a/app/Http/Requests/ClientPortal/Invoices/ProcessInvoicesInBulkRequest.php
+++ b/app/Http/Requests/ClientPortal/Invoices/ProcessInvoicesInBulkRequest.php
@@ -19,7 +19,7 @@ class ProcessInvoicesInBulkRequest extends FormRequest
 {
     public function authorize()
     {
-        return auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES;
+        return auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES;
     }
 
     public function rules()
diff --git a/app/Http/Requests/ClientPortal/Invoices/ShowInvoiceRequest.php b/app/Http/Requests/ClientPortal/Invoices/ShowInvoiceRequest.php
index f272521d0821..1795dab2f67e 100644
--- a/app/Http/Requests/ClientPortal/Invoices/ShowInvoiceRequest.php
+++ b/app/Http/Requests/ClientPortal/Invoices/ShowInvoiceRequest.php
@@ -23,7 +23,7 @@ class ShowInvoiceRequest extends Request
      */
     public function authorize() : bool
     {
-        return auth('contact')->user()->client->id == $this->invoice->client_id
-            &&  auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES;
+        return auth()->guard('contact')->user()->client_id == $this->invoice->client_id
+            &&  auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES;
     }
 }
diff --git a/app/Http/Requests/ClientPortal/Invoices/ShowInvoicesRequest.php b/app/Http/Requests/ClientPortal/Invoices/ShowInvoicesRequest.php
index cf8b13f7a617..013d3c96bde7 100644
--- a/app/Http/Requests/ClientPortal/Invoices/ShowInvoicesRequest.php
+++ b/app/Http/Requests/ClientPortal/Invoices/ShowInvoicesRequest.php
@@ -19,7 +19,7 @@ class ShowInvoicesRequest extends FormRequest
 {
     public function authorize()
     {
-        return auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES;
+        return auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES;
     }
 
     public function rules()
diff --git a/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php b/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php
index 0c312549230d..096eb41206c4 100644
--- a/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php
+++ b/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php
@@ -20,7 +20,7 @@ class ProcessQuotesInBulkRequest extends FormRequest
 {
     public function authorize()
     {
-        return auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES;
+        return auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES;
     }
 
     public function rules()
diff --git a/app/Http/Requests/ClientPortal/Quotes/ShowQuoteRequest.php b/app/Http/Requests/ClientPortal/Quotes/ShowQuoteRequest.php
index 72fe286b064c..4c6b819cd5e6 100644
--- a/app/Http/Requests/ClientPortal/Quotes/ShowQuoteRequest.php
+++ b/app/Http/Requests/ClientPortal/Quotes/ShowQuoteRequest.php
@@ -20,7 +20,7 @@ class ShowQuoteRequest extends FormRequest
     public function authorize()
     {
          return auth()->user()->client->id === $this->quote->client_id
-             && auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES;
+             && auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES;
     }
 
     public function rules()
diff --git a/app/Http/Requests/ClientPortal/Quotes/ShowQuotesRequest.php b/app/Http/Requests/ClientPortal/Quotes/ShowQuotesRequest.php
index 6e92f66e7694..abb9c39dd68f 100644
--- a/app/Http/Requests/ClientPortal/Quotes/ShowQuotesRequest.php
+++ b/app/Http/Requests/ClientPortal/Quotes/ShowQuotesRequest.php
@@ -19,7 +19,7 @@ class ShowQuotesRequest extends FormRequest
 {
     public function authorize()
     {
-        return auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES;
+        return auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES;
     }
 
     public function rules()
diff --git a/app/Http/Requests/ClientPortal/RecurringInvoices/RequestCancellationRequest.php b/app/Http/Requests/ClientPortal/RecurringInvoices/RequestCancellationRequest.php
index c4f1cd4ca470..25acacd46d1d 100644
--- a/app/Http/Requests/ClientPortal/RecurringInvoices/RequestCancellationRequest.php
+++ b/app/Http/Requests/ClientPortal/RecurringInvoices/RequestCancellationRequest.php
@@ -9,7 +9,7 @@ class RequestCancellationRequest extends FormRequest
 {
     public function authorize()
     {
-        return auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES;
+        return auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES;
     }
 
     public function rules()
diff --git a/app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoiceRequest.php b/app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoiceRequest.php
index 66108ed79fba..262c1b46d4e2 100644
--- a/app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoiceRequest.php
+++ b/app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoiceRequest.php
@@ -18,8 +18,8 @@ class ShowRecurringInvoiceRequest extends Request
 {
     public function authorize() : bool
     {
-        return auth('contact')->user()->client->id === $this->recurring_invoice->client_id
-            && auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES;
+        return auth()->guard('contact')->user()->client->id === $this->recurring_invoice->client_id
+            && auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES;
     }
 
     public function rules()
diff --git a/app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoicesRequest.php b/app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoicesRequest.php
index eb785596bf1e..a45ffab8b6fc 100644
--- a/app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoicesRequest.php
+++ b/app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoicesRequest.php
@@ -19,7 +19,7 @@ class ShowRecurringInvoicesRequest extends FormRequest
 {
     public function authorize()
     {
-        return auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES;
+        return auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES;
     }
 
     public function rules()
diff --git a/app/Http/Requests/ClientPortal/Statements/ShowStatementRequest.php b/app/Http/Requests/ClientPortal/Statements/ShowStatementRequest.php
index c205aac9095c..aa571296526a 100644
--- a/app/Http/Requests/ClientPortal/Statements/ShowStatementRequest.php
+++ b/app/Http/Requests/ClientPortal/Statements/ShowStatementRequest.php
@@ -44,6 +44,6 @@ class ShowStatementRequest extends FormRequest
 
     public function client(): Client
     {
-        return auth('contact')->user()->client;
+        return auth()->guard('contact')->user()->client;
     }
 }
diff --git a/app/Http/Requests/ClientPortal/Uploads/StoreUploadRequest.php b/app/Http/Requests/ClientPortal/Uploads/StoreUploadRequest.php
index 0351e92799d5..a106df59e9ab 100644
--- a/app/Http/Requests/ClientPortal/Uploads/StoreUploadRequest.php
+++ b/app/Http/Requests/ClientPortal/Uploads/StoreUploadRequest.php
@@ -13,7 +13,7 @@ class StoreUploadRequest extends FormRequest
      */
     public function authorize()
     {
-        return (bool) auth('contact')->user()->client->getSetting('client_portal_enable_uploads');
+        return (bool) auth()->guard('contact')->user()->client->getSetting('client_portal_enable_uploads');
     }
 
     /**
diff --git a/app/Http/ViewComposers/PortalComposer.php b/app/Http/ViewComposers/PortalComposer.php
index e6b79e6f5a83..e31771e1b160 100644
--- a/app/Http/ViewComposers/PortalComposer.php
+++ b/app/Http/ViewComposers/PortalComposer.php
@@ -51,10 +51,10 @@ class PortalComposer
 
         $view->with($this->portalData());
 
-        if (auth('contact')->user()) {
+        if (auth()->guard('contact')->user()) {
             App::forgetInstance('translator');
             $t = app('translator');
-            $t->replace(Ninja::transformTranslations(auth('contact')->user()->client->getMergedSettings()));
+            $t->replace(Ninja::transformTranslations(auth()->guard('contact')->user()->client->getMergedSettings()));
         }
     }
 
@@ -63,21 +63,21 @@ class PortalComposer
      */
     private function portalData() :array
     {
-        if (! auth('contact')->user()) {
+        if (! auth()->guard('contact')->user()) {
             return [];
         }
 
-        $this->settings = auth('contact')->user()->client->getMergedSettings();
+        $this->settings = auth()->guard('contact')->user()->client->getMergedSettings();
 
         $data['sidebar'] = $this->sidebarMenu();
         $data['header'] = [];
         $data['footer'] = [];
         $data['countries'] = TranslationHelper::getCountries();
-        $data['company'] = auth('contact')->user()->company;
-        $data['client'] = auth('contact')->user()->client;
+        $data['company'] = auth()->guard('contact')->user()->company;
+        $data['client'] = auth()->guard('contact')->user()->client;
         $data['settings'] = $this->settings;
         $data['currencies'] = TranslationHelper::getCurrencies();
-        $data['contact'] = auth('contact')->user();
+        $data['contact'] = auth()->guard('contact')->user();
 
         $data['multiple_contacts'] = session()->get('multiple_contacts') ?: collect();
 
@@ -86,7 +86,7 @@ class PortalComposer
 
     private function sidebarMenu() :array
     {
-        $enabled_modules = auth('contact')->user()->company->enabled_modules;
+        $enabled_modules = auth()->guard('contact')->user()->company->enabled_modules;
         $data = [];
 
         // TODO: Enable dashboard once it's completed.
@@ -114,13 +114,13 @@ class PortalComposer
         $data[] = ['title' => ctrans('texts.payment_methods'), 'url' => 'client.payment_methods.index', 'icon' => 'shield'];
         $data[] = ['title' => ctrans('texts.documents'), 'url' => 'client.documents.index', 'icon' => 'download'];
 
-        if (auth('contact')->user()->client->getSetting('enable_client_portal_tasks')) {
+        if (auth()->guard('contact')->user()->client->getSetting('enable_client_portal_tasks')) {
             $data[] = ['title' => ctrans('texts.tasks'), 'url' => 'client.tasks.index', 'icon' => 'clock'];
         }
 
         $data[] = ['title' => ctrans('texts.statement'), 'url' => 'client.statement', 'icon' => 'activity'];
 
-        if(Ninja::isHosted() && auth('contact')->user()->company->id == config('ninja.ninja_default_company_id'))
+        if(Ninja::isHosted() && auth()->guard('contact')->user()->company->id == config('ninja.ninja_default_company_id'))
             $data[] = ['title' => ctrans('texts.plan'), 'url' => 'client.plan', 'icon' => 'credit-card'];
         else
             $data[] = ['title' => ctrans('texts.subscriptions'), 'url' => 'client.subscriptions.index', 'icon' => 'calendar'];
diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php
index 689abc16d45a..be15ce093b97 100644
--- a/app/Models/RecurringInvoice.php
+++ b/app/Models/RecurringInvoice.php
@@ -458,14 +458,13 @@ class RecurringInvoice extends BaseModel
 
     public function calculateDueDate($date)
     {
-        //if nothing is set, assume we are using terms.
-        if(!$this->due_date_days)
-            return $this->calculateDateFromTerms($date);    
 
         switch ($this->due_date_days) {
             case 'terms':
+            case '':
                 return $this->calculateDateFromTerms($date);
                 break;
+
             default:
                 return $this->setDayOfMonth($date, $this->due_date_days);
                 break;
diff --git a/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php b/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php
index db5d2a6b54e7..612e1cf5649e 100644
--- a/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php
+++ b/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php
@@ -125,7 +125,7 @@ class AuthorizeCreditCard
     {
         $client_gateway_token = ClientGatewayToken::query()
             ->where('id', $this->decodePrimaryKey($request->token))
-            ->where('company_id', auth('contact')->user()->client->company->id)
+            ->where('company_id', auth()->guard('contact')->user()->client->company->id)
             ->first();
 
         if (!$client_gateway_token) {
diff --git a/app/PaymentDrivers/Braintree/ACH.php b/app/PaymentDrivers/Braintree/ACH.php
index de109c54cbff..fcc7a1406ccf 100644
--- a/app/PaymentDrivers/Braintree/ACH.php
+++ b/app/PaymentDrivers/Braintree/ACH.php
@@ -109,7 +109,7 @@ class ACH implements MethodInterface
         $customer = $this->braintree->findOrCreateCustomer();
 
         $token = ClientGatewayToken::query()
-            ->where('client_id', auth('contact')->user()->client->id)
+            ->where('client_id', auth()->guard('contact')->user()->client->id)
             ->where('id', $this->decodePrimaryKey($request->source))
             ->firstOrFail();
 
diff --git a/app/PaymentDrivers/CheckoutCom/CreditCard.php b/app/PaymentDrivers/CheckoutCom/CreditCard.php
index 04fe776dc5c1..f6c97c24e4c0 100644
--- a/app/PaymentDrivers/CheckoutCom/CreditCard.php
+++ b/app/PaymentDrivers/CheckoutCom/CreditCard.php
@@ -145,7 +145,7 @@ class CreditCard implements MethodInterface
     {
         $cgt = ClientGatewayToken::query()
             ->where('id', $this->decodePrimaryKey($request->input('token')))
-            ->where('company_id', auth('contact')->user()->client->company->id)
+            ->where('company_id', auth()->guard('contact')->user()->client->company->id)
             ->first();
 
         if (!$cgt) {
diff --git a/app/PaymentDrivers/GoCardless/ACH.php b/app/PaymentDrivers/GoCardless/ACH.php
index c466754f58fa..c15f0795f52b 100644
--- a/app/PaymentDrivers/GoCardless/ACH.php
+++ b/app/PaymentDrivers/GoCardless/ACH.php
@@ -64,12 +64,12 @@ class ACH implements MethodInterface
                         'session_token' => $session_token,
                     ]),
                     "prefilled_customer" => [
-                        "given_name" => auth('contact')->user()->first_name,
-                        "family_name" => auth('contact')->user()->last_name,
-                        "email" => auth('contact')->user()->email,
-                        "address_line1" => auth('contact')->user()->client->address1,
-                        "city" => auth('contact')->user()->client->city,
-                        "postal_code" => auth('contact')->user()->client->postal_code,
+                        "given_name" => auth()->guard('contact')->user()->first_name,
+                        "family_name" => auth()->guard('contact')->user()->last_name,
+                        "email" => auth()->guard('contact')->user()->email,
+                        "address_line1" => auth()->guard('contact')->user()->client->address1,
+                        "city" => auth()->guard('contact')->user()->client->city,
+                        "postal_code" => auth()->guard('contact')->user()->client->postal_code,
                     ],
                 ],
             ]);
diff --git a/app/PaymentDrivers/GoCardless/DirectDebit.php b/app/PaymentDrivers/GoCardless/DirectDebit.php
index 51ae2fb1de91..cebefcc9735b 100644
--- a/app/PaymentDrivers/GoCardless/DirectDebit.php
+++ b/app/PaymentDrivers/GoCardless/DirectDebit.php
@@ -62,12 +62,12 @@ class DirectDebit implements MethodInterface
                         'session_token' => $session_token,
                     ]),
                     'prefilled_customer' => [
-                        'given_name' => auth('contact')->user()->first_name,
-                        'family_name' => auth('contact')->user()->last_name,
-                        'email' => auth('contact')->user()->email,
-                        'address_line1' => auth('contact')->user()->client->address1,
-                        'city' => auth('contact')->user()->client->city,
-                        'postal_code' => auth('contact')->user()->client->postal_code,
+                        'given_name' => auth()->guard('contact')->user()->first_name,
+                        'family_name' => auth()->guard('contact')->user()->last_name,
+                        'email' => auth()->guard('contact')->user()->email,
+                        'address_line1' => auth()->guard('contact')->user()->client->address1,
+                        'city' => auth()->guard('contact')->user()->client->city,
+                        'postal_code' => auth()->guard('contact')->user()->client->postal_code,
                     ],
                 ],
             ]);
diff --git a/app/PaymentDrivers/GoCardless/SEPA.php b/app/PaymentDrivers/GoCardless/SEPA.php
index d14d84a69d34..8e4d1312848d 100644
--- a/app/PaymentDrivers/GoCardless/SEPA.php
+++ b/app/PaymentDrivers/GoCardless/SEPA.php
@@ -63,12 +63,12 @@ class SEPA implements MethodInterface
                         'session_token' => $session_token,
                     ]),
                     'prefilled_customer' => [
-                        'given_name' => auth('contact')->user()->first_name,
-                        'family_name' => auth('contact')->user()->last_name,
-                        'email' => auth('contact')->user()->email,
-                        'address_line1' => auth('contact')->user()->client->address1,
-                        'city' => auth('contact')->user()->client->city,
-                        'postal_code' => auth('contact')->user()->client->postal_code,
+                        'given_name' => auth()->guard('contact')->user()->first_name,
+                        'family_name' => auth()->guard('contact')->user()->last_name,
+                        'email' => auth()->guard('contact')->user()->email,
+                        'address_line1' => auth()->guard('contact')->user()->client->address1,
+                        'city' => auth()->guard('contact')->user()->client->city,
+                        'postal_code' => auth()->guard('contact')->user()->client->postal_code,
                     ],
                 ],
             ]);
diff --git a/app/PaymentDrivers/Stripe/ACH.php b/app/PaymentDrivers/Stripe/ACH.php
index cac64514a20c..59889ab86a12 100644
--- a/app/PaymentDrivers/Stripe/ACH.php
+++ b/app/PaymentDrivers/Stripe/ACH.php
@@ -74,13 +74,13 @@ class ACH
         $mailer = new NinjaMailerObject();
 
         $mailer->mailable = new ACHVerificationNotification(
-            auth('contact')->user()->client->company, 
-            route('client.contact_login', ['contact_key' => auth('contact')->user()->contact_key, 'next' => $verification])
+            auth()->guard('contact')->user()->client->company, 
+            route('client.contact_login', ['contact_key' => auth()->guard('contact')->user()->contact_key, 'next' => $verification])
         );
 
-        $mailer->company = auth('contact')->user()->client->company;
-        $mailer->settings = auth('contact')->user()->client->company->settings;
-        $mailer->to_user = auth('contact')->user();
+        $mailer->company = auth()->guard('contact')->user()->client->company;
+        $mailer->settings = auth()->guard('contact')->user()->client->company->settings;
+        $mailer->to_user = auth()->guard('contact')->user();
 
         NinjaMailerJob::dispatch($mailer);
 
@@ -210,7 +210,7 @@ class ACH
 
         $source = ClientGatewayToken::query()
             ->where('id', $this->decodePrimaryKey($request->source))
-            ->where('company_id', auth('contact')->user()->client->company->id)
+            ->where('company_id', auth()->guard('contact')->user()->client->company->id)
             ->first();
 
         if (!$source) {
diff --git a/app/PaymentDrivers/Stripe/ACSS.php b/app/PaymentDrivers/Stripe/ACSS.php
index cab2b571133d..7f3c0cc4a116 100644
--- a/app/PaymentDrivers/Stripe/ACSS.php
+++ b/app/PaymentDrivers/Stripe/ACSS.php
@@ -66,13 +66,13 @@ class ACSS
         $mailer = new NinjaMailerObject();
 
         $mailer->mailable = new ACHVerificationNotification(
-            auth('contact')->user()->client->company,
-            route('client.contact_login', ['contact_key' => auth('contact')->user()->contact_key, 'next' => $verification])
+            auth()->guard('contact')->user()->client->company,
+            route('client.contact_login', ['contact_key' => auth()->guard('contact')->user()->contact_key, 'next' => $verification])
         );
 
-        $mailer->company = auth('contact')->user()->client->company;
-        $mailer->settings = auth('contact')->user()->client->company->settings;
-        $mailer->to_user = auth('contact')->user();
+        $mailer->company = auth()->guard('contact')->user()->client->company;
+        $mailer->settings = auth()->guard('contact')->user()->client->company->settings;
+        $mailer->to_user = auth()->guard('contact')->user();
 
         NinjaMailerJob::dispatch($mailer);
 
diff --git a/app/Services/Subscription/SubscriptionService.php b/app/Services/Subscription/SubscriptionService.php
index 4dcf472ba0f5..2cf99ad5b410 100644
--- a/app/Services/Subscription/SubscriptionService.php
+++ b/app/Services/Subscription/SubscriptionService.php
@@ -91,7 +91,7 @@ class SubscriptionService
                 'invoice' => $this->encodePrimaryKey($payment_hash->fee_invoice_id),
                 'client' => $recurring_invoice->client->hashed_id,
                 'subscription' => $this->subscription->hashed_id,
-                'contact' => auth('contact')->user() ? auth('contact')->user()->hashed_id : $recurring_invoice->client->contacts()->first()->hashed_id,
+                'contact' => auth()->guard('contact')->user() ? auth()->guard('contact')->user()->hashed_id : $recurring_invoice->client->contacts()->first()->hashed_id,
                 'account_key' => $recurring_invoice->client->custom_value2,
             ];
 
@@ -452,7 +452,7 @@ class SubscriptionService
                 'credit' => $credit ? $credit->hashed_id : null,
                 'client' => $new_recurring_invoice->client->hashed_id,
                 'subscription' => $target_subscription->hashed_id,
-                'contact' => auth('contact')->user()->hashed_id,
+                'contact' => auth()->guard('contact')->user()->hashed_id,
                 'account_key' => $new_recurring_invoice->client->custom_value2,
             ];
 
@@ -573,7 +573,7 @@ class SubscriptionService
             'invoice' => $this->encodePrimaryKey($payment_hash->fee_invoice_id),
             'client' => $recurring_invoice->client->hashed_id,
             'subscription' => $this->subscription->hashed_id,
-            'contact' => auth('contact')->user()->hashed_id,
+            'contact' => auth()->guard('contact')->user()->hashed_id,
             'account_key' => $recurring_invoice->client->custom_value2,
         ];
 
@@ -921,7 +921,7 @@ class SubscriptionService
                 'subscription' => $this->subscription->hashed_id,
                 'recurring_invoice' => $recurring_invoice->hashed_id,
                 'client' => $recurring_invoice->client->hashed_id,
-                'contact' => auth('contact')->user()->hashed_id,
+                'contact' => auth()->guard('contact')->user()->hashed_id,
                 'account_key' => $recurring_invoice->client->custom_value2,
             ];
 
diff --git a/app/Services/Subscription/ZeroCostProduct.php b/app/Services/Subscription/ZeroCostProduct.php
index fdec4b6b95e8..52fe4598ea46 100644
--- a/app/Services/Subscription/ZeroCostProduct.php
+++ b/app/Services/Subscription/ZeroCostProduct.php
@@ -71,7 +71,7 @@ class ZeroCostProduct extends AbstractService
                 'invoice' => $invoice->hashed_id,
                 'client' => $recurring_invoice->client->hashed_id,
                 'subscription' => $this->subscription->hashed_id,
-                'contact' => auth('contact')->user()->hashed_id,
+                'contact' => auth()->guard('contact')->user()->hashed_id,
                 'redirect_url' => "/client/recurring_invoices/{$recurring_invoice->hashed_id}",
             ];
 
diff --git a/resources/views/billing-portal/purchase.blade.php b/resources/views/billing-portal/purchase.blade.php
index 2a1bb173ecb8..80fe64c74ac7 100644
--- a/resources/views/billing-portal/purchase.blade.php
+++ b/resources/views/billing-portal/purchase.blade.php
@@ -2,7 +2,7 @@
 @section('meta_title', ctrans('texts.purchase'))
 
 @section('body')
-    @livewire('billing-portal-purchase', ['subscription' => $subscription, 'company' => $subscription->company, 'contact' => auth('contact')->user(), 'hash' => $hash, 'request_data' => $request_data, 'campaign' => request()->query('campaign') ?? null])
+    @livewire('billing-portal-purchase', ['subscription' => $subscription, 'company' => $subscription->company, 'contact' => auth()->guard('contact')->user(), 'hash' => $hash, 'request_data' => $request_data, 'campaign' => request()->query('campaign') ?? null])
 @stop
 
 @push('footer')
diff --git a/resources/views/portal/ninja2020/components/general/footer.blade.php b/resources/views/portal/ninja2020/components/general/footer.blade.php
index 770e8d5e7748..f00ad63f105d 100644
--- a/resources/views/portal/ninja2020/components/general/footer.blade.php
+++ b/resources/views/portal/ninja2020/components/general/footer.blade.php
@@ -1,7 +1,7 @@
 <footer class="bg-white px-4 py-5 shadow px-4 sm:px-6 md:px-8 flex justify-center border-t border-gray-200 justify-between items-center" x-data="{ privacy: false, tos: false }">
     <section>
-        @if(auth('contact')->user() && auth('contact')->user()->user->account->isPaid())
-            <span class="text-xs md:text-sm text-gray-700">{{ ctrans('texts.footer_label', ['company' => auth('contact')->user()->company->present()->name(), 'year' => date('Y')]) }}</span>
+        @if(auth()->guard('contact')->user() && auth()->guard('contact')->user()->user->account->isPaid())
+            <span class="text-xs md:text-sm text-gray-700">{{ ctrans('texts.footer_label', ['company' => auth()->guard('contact')->user()->company->present()->name(), 'year' => date('Y')]) }}</span>
         @else
             <span href="https://invoiceninja.com" target="_blank" class="text-xs md:text-sm text-gray-700">
                 {{ ctrans('texts.copyright') }} &copy; {{ date('Y') }}
@@ -26,7 +26,7 @@
         </div>
     </section>
 
-    @if(auth('contact')->user()->user && !auth('contact')->user()->user->account->isPaid())
+    @if(auth()->guard('contact')->user()->user && !auth()->guard('contact')->user()->user->account->isPaid())
         <a href="https://invoiceninja.com" target="_blank">
             <img class="h-8" src="{{ asset('images/invoiceninja-black-logo-2.png') }}" alt="Invoice Ninja Logo">
         </a>
diff --git a/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php b/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php
index 116a96285927..ebfbb8ebbb6b 100644
--- a/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php
+++ b/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php
@@ -2,8 +2,8 @@
     <div class="flex flex-col w-64">
         <div class="flex items-center h-16 flex-shrink-0 px-4 bg-white border-r justify-center z-10">
             <a href="{{ route('client.dashboard') }}">
-                <img class="h-10 w-auto" src="{!! auth('contact')->user()->company->present()->logo($settings) !!}"
-                     alt="{{ auth('contact')->user()->company->present()->name() }} logo"/>
+                <img class="h-10 w-auto" src="{!! auth()->guard('contact')->user()->company->present()->logo($settings) !!}"
+                     alt="{{ auth()->guard('contact')->user()->company->present()->name() }} logo"/>
             </a>
         </div>
         <div class="h-0 flex-1 flex flex-col overflow-y-auto z-0 border-r">
@@ -24,7 +24,7 @@
                 @endforeach
             </nav>
 
-            @if(!auth('contact')->user()->user->account->isPaid())
+            @if(!auth()->guard('contact')->user()->user->account->isPaid())
                 <div class="flex-shrink-0 flex bg-white p-4 justify-center">
                     <div class="flex items-center">
                         <a target="_blank" href="https://www.facebook.com/invoiceninja/">
diff --git a/resources/views/portal/ninja2020/components/general/sidebar/header.blade.php b/resources/views/portal/ninja2020/components/general/sidebar/header.blade.php
index 639f95cf4667..36079be88655 100644
--- a/resources/views/portal/ninja2020/components/general/sidebar/header.blade.php
+++ b/resources/views/portal/ninja2020/components/general/sidebar/header.blade.php
@@ -12,7 +12,7 @@
                 <div>
                     <span class="rounded shadow-sm">
                         <button x-on:click="open = !open" x-on:click.away="open = false" type="button" class="inline-flex justify-center w-full rounded-md border border-gray-300 px-4 py-2 bg-white text-sm leading-5 font-medium text-gray-700 hover:text-gray-500 focus:outline-none focus:border-blue-300 focus:ring-blue active:bg-gray-50 active:text-gray-800 transition ease-in-out duration-150">
-                            <span class="hidden md:block mr-1">{{ auth('contact')->user()->company->present()->name }}</span>
+                            <span class="hidden md:block mr-1">{{ auth()->guard('contact')->user()->company->present()->name }}</span>
                             <svg class="md:-mr-1 md:ml-2 h-5 w-5" fill="currentColor" viewBox="0 0 20 20">
                                 <path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clip-rule="evenodd" />
                             </svg>
@@ -37,8 +37,8 @@
                 <div>
                     <button data-ref="client-profile-dropdown" @click="open = !open"
                             class="max-w-xs flex items-center text-sm rounded-full focus:outline-none focus:ring">
-                        <img class="h-8 w-8 rounded-full" src="{{ auth('contact')->user()->avatar() }}" alt=""/>
-                        <span class="ml-2 hidden sm:block">{{ auth('contact')->user()->present()->name() }}</span>
+                        <img class="h-8 w-8 rounded-full" src="{{ auth()->guard('contact')->user()->avatar() }}" alt=""/>
+                        <span class="ml-2 hidden sm:block">{{ auth()->guard('contact')->user()->present()->name() }}</span>
                     </button>
                 </div>
                 <div x-show="open" style="display:none;" x-transition:enter="transition ease-out duration-100"
@@ -50,7 +50,7 @@
                      class="origin-top-right absolute right-0 mt-2 w-48 rounded-md shadow-lg">
                     <div class="py-1 rounded-md bg-white ring-1 ring-black ring-opacity-5">
                         <a data-ref="client-profile-dropdown-settings"
-                           href="{{ route('client.profile.edit', ['client_contact' => auth('contact')->user()->hashed_id]) }}"
+                           href="{{ route('client.profile.edit', ['client_contact' => auth()->guard('contact')->user()->hashed_id]) }}"
                            class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 transition ease-in-out duration-150">
                             {{ ctrans('texts.profile') }}
                         </a>
diff --git a/resources/views/portal/ninja2020/components/general/sidebar/mobile.blade.php b/resources/views/portal/ninja2020/components/general/sidebar/mobile.blade.php
index 8dca53ac66fb..bbb3e1164af7 100644
--- a/resources/views/portal/ninja2020/components/general/sidebar/mobile.blade.php
+++ b/resources/views/portal/ninja2020/components/general/sidebar/mobile.blade.php
@@ -9,7 +9,7 @@
             </button>
         </div>
         <div class="flex-shrink-0 flex items-center px-4">
-            <img class="h-8 w-auto" src="{!! auth('contact')->user()->company->present()->logo($settings) !!}" alt="{{ auth('contact')->user()->company->present()->name() }} logo" />
+            <img class="h-8 w-auto" src="{!! auth()->guard('contact')->user()->company->present()->logo($settings) !!}" alt="{{ auth()->guard('contact')->user()->company->present()->name() }} logo" />
         </div>
         <div class="mt-5 flex-1 h-0 overflow-y-auto">
             <nav class="flex-1 pb-4 pt-0 bg-white">
@@ -28,7 +28,7 @@
                 @endforeach
             </nav>
 
-            @if(!auth('contact')->user()->user->account->isPaid())
+            @if(!auth()->guard('contact')->user()->user->account->isPaid())
             <div class="flex-shrink-0 flex bg-white p-4 justify-center">
                 <div class="flex items-center">
                     <a target="_blank" href="https://www.facebook.com/invoiceninja/">
diff --git a/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php b/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php
index 07350864bf22..c5e03cec9f8d 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php
@@ -70,7 +70,7 @@
 
     @component('portal.ninja2020.components.general.card-element-single')
         <input type="checkbox" class="form-checkbox mr-1" id="accept-terms" required>
-        <label for="accept-terms" class="cursor-pointer">{{ ctrans('texts.ach_authorization', ['company' => auth()->user()->company->present()->name, 'email' => auth('contact')->user()->client->company->settings->email]) }}</label>
+        <label for="accept-terms" class="cursor-pointer">{{ ctrans('texts.ach_authorization', ['company' => auth()->user()->company->present()->name, 'email' => auth()->guard('contact')->user()->client->company->settings->email]) }}</label>
     @endcomponent
 
     @component('portal.ninja2020.gateways.includes.pay_now', ['id' => 'save-button'])
diff --git a/resources/views/portal/ninja2020/gateways/stripe/becs/authorize.blade.php b/resources/views/portal/ninja2020/gateways/stripe/becs/authorize.blade.php
index 78f859b75c30..0a5f0173e910 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/becs/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/becs/authorize.blade.php
@@ -70,7 +70,7 @@
 
     @component('portal.ninja2020.components.general.card-element-single')
         <input type="checkbox" class="form-checkbox mr-1" id="accept-terms" required>
-        <label for="accept-terms" class="cursor-pointer">{{ ctrans('texts.ach_authorization', ['company' => auth()->user()->company->present()->name, 'email' => auth('contact')->user()->client->company->settings->email]) }}</label>
+        <label for="accept-terms" class="cursor-pointer">{{ ctrans('texts.ach_authorization', ['company' => auth()->user()->company->present()->name, 'email' => auth()->guard('contact')->user()->client->company->settings->email]) }}</label>
     @endcomponent
 
     @component('portal.ninja2020.gateways.includes.pay_now', ['id' => 'save-button'])
diff --git a/resources/views/portal/ninja2020/gateways/stripe/przelewy24/authorize.blade.php b/resources/views/portal/ninja2020/gateways/stripe/przelewy24/authorize.blade.php
index 78f859b75c30..0a5f0173e910 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/przelewy24/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/przelewy24/authorize.blade.php
@@ -70,7 +70,7 @@
 
     @component('portal.ninja2020.components.general.card-element-single')
         <input type="checkbox" class="form-checkbox mr-1" id="accept-terms" required>
-        <label for="accept-terms" class="cursor-pointer">{{ ctrans('texts.ach_authorization', ['company' => auth()->user()->company->present()->name, 'email' => auth('contact')->user()->client->company->settings->email]) }}</label>
+        <label for="accept-terms" class="cursor-pointer">{{ ctrans('texts.ach_authorization', ['company' => auth()->user()->company->present()->name, 'email' => auth()->guard('contact')->user()->client->company->settings->email]) }}</label>
     @endcomponent
 
     @component('portal.ninja2020.gateways.includes.pay_now', ['id' => 'save-button'])
diff --git a/resources/views/portal/ninja2020/gateways/stripe/sepa/authorize.blade.php b/resources/views/portal/ninja2020/gateways/stripe/sepa/authorize.blade.php
index 78f859b75c30..0a5f0173e910 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/sepa/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/sepa/authorize.blade.php
@@ -70,7 +70,7 @@
 
     @component('portal.ninja2020.components.general.card-element-single')
         <input type="checkbox" class="form-checkbox mr-1" id="accept-terms" required>
-        <label for="accept-terms" class="cursor-pointer">{{ ctrans('texts.ach_authorization', ['company' => auth()->user()->company->present()->name, 'email' => auth('contact')->user()->client->company->settings->email]) }}</label>
+        <label for="accept-terms" class="cursor-pointer">{{ ctrans('texts.ach_authorization', ['company' => auth()->user()->company->present()->name, 'email' => auth()->guard('contact')->user()->client->company->settings->email]) }}</label>
     @endcomponent
 
     @component('portal.ninja2020.gateways.includes.pay_now', ['id' => 'save-button'])
diff --git a/resources/views/portal/ninja2020/layout/app.blade.php b/resources/views/portal/ninja2020/layout/app.blade.php
index ec85a7b6c4dd..e12b2d244360 100644
--- a/resources/views/portal/ninja2020/layout/app.blade.php
+++ b/resources/views/portal/ninja2020/layout/app.blade.php
@@ -57,7 +57,7 @@
         <!-- Styles -->
         <link href="{{ mix('css/app.css') }}" rel="stylesheet">
 
-        @if(!auth('contact')->user()->user->account->isPaid())
+        @if(!auth()->guard('contact')->user()->user->account->isPaid())
             <link href="{{ asset('favicon.png') }}" rel="shortcut icon" type="image/png">
         @endif
 
diff --git a/resources/views/portal/ninja2020/layout/clean_setup.blade.php b/resources/views/portal/ninja2020/layout/clean_setup.blade.php
index b6ee48ec1964..67790c9387e7 100644
--- a/resources/views/portal/ninja2020/layout/clean_setup.blade.php
+++ b/resources/views/portal/ninja2020/layout/clean_setup.blade.php
@@ -32,7 +32,7 @@
 
         <!-- Title -->
         @auth()
-            <title>@yield('meta_title', '') — {{ auth('contact')->user()->user->account->isPaid() ? auth('contact')->user()->company->present()->name() : 'Invoice Ninja' }}</title>
+            <title>@yield('meta_title', '') — {{ auth()->guard('contact')->user()->user->account->isPaid() ? auth()->guard('contact')->user()->company->present()->name() : 'Invoice Ninja' }}</title>
         @endauth
 
         @guest
diff --git a/resources/views/portal/ninja2020/layout/payments.blade.php b/resources/views/portal/ninja2020/layout/payments.blade.php
index b9f5bb9db00b..89546987201c 100644
--- a/resources/views/portal/ninja2020/layout/payments.blade.php
+++ b/resources/views/portal/ninja2020/layout/payments.blade.php
@@ -11,7 +11,7 @@
 @endpush
 
 @section('body')
-    @livewire('required-client-info', ['fields' => method_exists($gateway, 'getClientRequiredFields') ? $gateway->getClientRequiredFields() : [], 'contact' => auth('contact')->user(), 'countries' => $countries, 'company' => $company])
+    @livewire('required-client-info', ['fields' => method_exists($gateway, 'getClientRequiredFields') ? $gateway->getClientRequiredFields() : [], 'contact' => auth()->guard('contact')->user(), 'countries' => $countries, 'company' => $company])
 
     <div class="container mx-auto grid grid-cols-12 opacity-25 pointer-events-none" data-ref="gateway-container">
         <div class="col-span-12 lg:col-span-6 lg:col-start-4 overflow-hidden bg-white shadow rounded-lg">
diff --git a/resources/views/themes/ninja2020/clean.blade.php b/resources/views/themes/ninja2020/clean.blade.php
index 074a82262491..22a7afe5c934 100644
--- a/resources/views/themes/ninja2020/clean.blade.php
+++ b/resources/views/themes/ninja2020/clean.blade.php
@@ -32,7 +32,7 @@
 
         <!-- Title -->
         @auth()
-            <title>@yield('meta_title', '') — {{ auth('contact')->user()->user->account->isPaid() ? auth('contact')->user()->company->present()->name() : 'Invoice Ninja' }}</title>
+            <title>@yield('meta_title', '') — {{ auth()->guard('contact')->user()->user->account->isPaid() ? auth()->guard('contact')->user()->company->present()->name() : 'Invoice Ninja' }}</title>
         @endauth
 
         @guest