diff --git a/app/Http/Controllers/SubdomainController.php b/app/Http/Controllers/SubdomainController.php
index 7751eda00d85..20334c32c111 100644
--- a/app/Http/Controllers/SubdomainController.php
+++ b/app/Http/Controllers/SubdomainController.php
@@ -28,6 +28,7 @@ class SubdomainController extends BaseController
         'custom_domain',
         'preview',
         'invoiceninja',
+        'cname',
     ];
 
     public function __construct()
diff --git a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
index bbd097d2aaae..d2f4e09d2893 100644
--- a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
@@ -107,6 +107,7 @@ class StoreRecurringInvoiceRequest extends Request
         } else {
             if ($client = Client::find($input['client_id'])) {
                 $input['auto_bill'] = $client->getSetting('auto_bill');
+                $input['auto_bill_enabled'] = $this->setAutoBillFlag($input['auto_bill']);
             }
         }
     
@@ -115,14 +116,12 @@ class StoreRecurringInvoiceRequest extends Request
 
     private function setAutoBillFlag($auto_bill)
     {
-        if ($auto_bill == 'always') {
+        if ($auto_bill == 'always' || $auto_bill == 'optout') {
             return true;
         }
-        
 
-        //if ($auto_bill == 'off' || $auto_bill == 'optin') {
         return false;
-        //}
+        
     }
 
     public function messages()