diff --git a/app/Http/Controllers/Auth/ContactLoginController.php b/app/Http/Controllers/Auth/ContactLoginController.php
index 18fbf462dc0d..eb64a0ac41e4 100644
--- a/app/Http/Controllers/Auth/ContactLoginController.php
+++ b/app/Http/Controllers/Auth/ContactLoginController.php
@@ -152,6 +152,7 @@ class ContactLoginController extends Controller
     public function logout()
     {
         Auth::guard('contact')->logout();
+        request()->session()->invalidate();
 
         return redirect('/client/login');
     }
diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php
index 24ff67640387..0748afca7a2f 100644
--- a/app/Http/Controllers/ClientPortal/InvitationController.php
+++ b/app/Http/Controllers/ClientPortal/InvitationController.php
@@ -98,6 +98,7 @@ class InvitationController extends Controller
             $client_contact->email = Str::random(15) . "@example.com"; $client_contact->save();
 
         if (request()->has('client_hash') && request()->input('client_hash') == $invitation->contact->client->client_hash) {
+            request()->session()->invalidate();
             auth()->guard('contact')->loginUsingId($client_contact->id, true);
 
         } elseif ((bool) $invitation->contact->client->getSetting('enable_client_portal_password') !== false) {
@@ -106,6 +107,7 @@ class InvitationController extends Controller
 
         } else {
             nlog("else - default - login contact");
+            request()->session()->invalidate();
             auth()->guard('contact')->loginUsingId($client_contact->id, true);
         }
 
diff --git a/app/Http/Middleware/SessionDomains.php b/app/Http/Middleware/SessionDomains.php
index d24ab7955796..0881aad8ed0f 100644
--- a/app/Http/Middleware/SessionDomains.php
+++ b/app/Http/Middleware/SessionDomains.php
@@ -35,7 +35,7 @@ class SessionDomains
 
         if (strpos($domain_name, 'invoicing.co') !== false) 
         {
-            config(['session.domain' => '.invoicing.co']);
+            // config(['session.domain' => '.invoicing.co']);
         }            
         else{
 
diff --git a/app/Http/Requests/Expense/UpdateExpenseRequest.php b/app/Http/Requests/Expense/UpdateExpenseRequest.php
index a4646ef73efd..8b8c668d5af9 100644
--- a/app/Http/Requests/Expense/UpdateExpenseRequest.php
+++ b/app/Http/Requests/Expense/UpdateExpenseRequest.php
@@ -34,10 +34,10 @@ class UpdateExpenseRequest extends Request
     public function rules()
     {
         /* Ensure we have a client name, and that all emails are unique*/
+        $rules = [];
+        // $rules['country_id'] = 'integer|nullable';
 
-        $rules['country_id'] = 'integer|nullable';
-
-        $rules['contacts.*.email'] = 'nullable|distinct';
+        // $rules['contacts.*.email'] = 'nullable|distinct';
 
         if (isset($this->number)) {
             $rules['number'] = Rule::unique('expenses')->where('company_id', auth()->user()->company()->id)->ignore($this->expense->id);
diff --git a/app/Services/Credit/CreditService.php b/app/Services/Credit/CreditService.php
index 8bd2e8c891a1..e7b00b44f995 100644
--- a/app/Services/Credit/CreditService.php
+++ b/app/Services/Credit/CreditService.php
@@ -108,6 +108,7 @@ class CreditService
 
         $this->updateBalance($adjustment)
              ->updatePaidToDate($adjustment)
+             ->setStatus(Credit::STATUS_APPLIED)
              ->save();
 
         //create a negative payment of total $this->credit->balance
@@ -136,7 +137,6 @@ class CreditService
              ->client
              ->service()
              ->updatePaidToDate($adjustment)
-             ->setStatus(Credit::STATUS_APPLIED)
              ->save();
 
         event('eloquent.created: App\Models\Payment', $payment);