diff --git a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
index 94fbd0ed7685..0083347a5504 100644
--- a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
@@ -112,8 +112,8 @@ class UpdateRecurringInvoiceRequest extends Request
             $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
         }
 
-        if (array_key_exists('auto_bill', $input) && isset($input['auto_bill']) && $this->setAutoBillFlag($input['auto_bill'])) {
-            $input['auto_bill_enabled'] = true;
+        if (array_key_exists('auto_bill', $input) && isset($input['auto_bill'])) {
+            $input['auto_bill_enabled'] = $this->setAutoBillFlag($input['auto_bill']);
         }
 
         if (array_key_exists('documents', $input)) {
@@ -132,9 +132,9 @@ class UpdateRecurringInvoiceRequest extends Request
      *
      * @return bool
      */
-    private function setAutoBillFlag($auto_bill) :bool
+    private function setAutoBillFlag($auto_bill)
     {
-        if ($auto_bill == 'always') {
+        if ($auto_bill == 'always' || $auto_bill == 'optout') {
             return true;
         }
 
diff --git a/resources/views/portal/ninja2020/gateways/includes/save_card.blade.php b/resources/views/portal/ninja2020/gateways/includes/save_card.blade.php
index e319effdcfd4..7a4ea8b41a3f 100644
--- a/resources/views/portal/ninja2020/gateways/includes/save_card.blade.php
+++ b/resources/views/portal/ninja2020/gateways/includes/save_card.blade.php
@@ -10,8 +10,13 @@
         $token_billing = false;
         $token_billing_string = 'false';
     }
-    
-    if($gateway_instance->token_billing == 'optout' || $gateway_instance->token_billing == 'always'){
+
+    if($gateway_instance->token_billing == 'always'){
+        $token_billing = false;
+        $token_billing_string = 'true';
+    }
+
+    if($gateway_instance->token_billing == 'optout'){
         $checked_on = 'checked';
         $checked_off = '';
     }