diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index 29be490f1f1d..83efe7d0d7ff 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -239,7 +239,7 @@ class CompanySettings extends BaseSettings
     public $client_portal_privacy_policy = '';
 
     public static $casts = [
-        'auto_bill'                          => 'auto_bill',
+        'auto_bill'                          => 'string',
         'lock_invoices'                      => 'string',
         'client_portal_terms'                => 'string',
         'client_portal_privacy_policy'       => 'string',
diff --git a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
index dd77f31a3971..dd221a448ba8 100644
--- a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
+++ b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
@@ -22,6 +22,9 @@ class AddIsPublicToDocumentsTable extends Migration
             $table->decimal('amount', 16, 4);
         });
 
+        Schema::table('company_gateways', function (Blueprint $table) {
+            $table->string('token_billing')->default('off');
+        });
     }
 
     /**