diff --git a/app/Http/Controllers/ClientPortal/PaymentController.php b/app/Http/Controllers/ClientPortal/PaymentController.php
index 9e65b6c3c866..ebf62177fc90 100644
--- a/app/Http/Controllers/ClientPortal/PaymentController.php
+++ b/app/Http/Controllers/ClientPortal/PaymentController.php
@@ -95,8 +95,12 @@ class PaymentController extends Controller
 
         $payment_hash = PaymentHash::whereRaw('BINARY `hash`= ?', [$request->payment_hash])->first();
 
+        $invoice = Invoice::with('client')->find($payment_hash->fee_invoice_id);
+        $client = $invoice->client->exists() ? $invoice->client : auth()->user()->client;
+
             return $gateway
-                ->driver(auth()->user()->client)
+                // ->driver(auth()->user()->client)
+                ->driver($client)
                 ->setPaymentMethod($request->input('payment_method_id'))
                 ->setPaymentHash($payment_hash)
                 ->checkRequirements()
diff --git a/app/Http/Middleware/ContactKeyLogin.php b/app/Http/Middleware/ContactKeyLogin.php
index c590bdb4dd3b..a40b423d91d0 100644
--- a/app/Http/Middleware/ContactKeyLogin.php
+++ b/app/Http/Middleware/ContactKeyLogin.php
@@ -37,6 +37,7 @@ class ContactKeyLogin
     {
         if (Auth::guard('contact')->check()) {
             Auth::guard('contact')->logout();
+            $request->session()->invalidate();
         }
 
         if ($request->segment(2) && $request->segment(2) == 'magic_link' && $request->segment(3)) {