diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php
index ff5a0d4936..213eef5360 100644
--- a/app/Http/Controllers/ClientPortal/InvoiceController.php
+++ b/app/Http/Controllers/ClientPortal/InvoiceController.php
@@ -127,6 +127,8 @@ class InvoiceController extends Controller
 
         $payment_methods = auth()->user()->client->service()->getPaymentMethods($total);
 
+        //if there is only one payment method -> lets return straight to the payment page
+
         $data = [
             'settings' => auth()->user()->client->getMergedSettings(),
             'invoices' => $invoices,
@@ -136,8 +138,6 @@ class InvoiceController extends Controller
             'total' =>  $total,
         ];
 
-// nlog($data);
-
         return $this->render('invoices.payment', $data);
     }
 
diff --git a/app/PaymentDrivers/StripePaymentDriver.php b/app/PaymentDrivers/StripePaymentDriver.php
index 6c5f2ee653..d76a44594e 100644
--- a/app/PaymentDrivers/StripePaymentDriver.php
+++ b/app/PaymentDrivers/StripePaymentDriver.php
@@ -407,7 +407,7 @@ class StripePaymentDriver extends BaseDriver
     {
         try {
             $stripe_payment_method = $this->getStripePaymentMethod($payment_method);
-            $stripe_payment_method->attach(['customer' => $customer->id], $this->stripe_connect_auth);
+            $stripe_payment_method->attach(['customer' => $customer->id], null, $this->stripe_connect_auth);
         } catch (ApiErrorException | Exception $e) {
             $this->processInternallyFailedPayment($this, $e);
         }
@@ -427,7 +427,9 @@ class StripePaymentDriver extends BaseDriver
         );
 
         try {
-            $stripe->paymentMethods->detach($token->token, $this->stripe_connect_auth);
+            $stripe_payment_method = $this->getStripePaymentMethod($token->token);
+            $stripe_payment_method->detach($token->token, null, $this->stripe_connect_auth);
+            //$stripe->paymentMethods->detach($token->token, $this->stripe_connect_auth);
         } catch (Exception $e) {
             SystemLogger::dispatch([
                 'server_response' => $e->getMessage(), 'data' => request()->all(),