diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index 1c660c00219f..a3e92c1b7459 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -553,7 +553,7 @@ class CompanySettings extends BaseSettings
 
         foreach ($company_settings as $key => $value) {
             if (! property_exists($settings, $key)) {
-                $settings->{ $key} = self::castAttribute($key, $company_settings->{ $key});
+                $settings->{$key} = self::castAttribute($key, $company_settings->{$key});
             }
         }
 
diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index de858640af54..62092a73bd63 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -729,6 +729,7 @@ class InvoiceController extends BaseController
                 $invoice->service()->touchReminder($this->reminder_template)->save();
 
                 $invoice->invitations->load('contact.client.country', 'invoice.client.country', 'invoice.company')->each(function ($invitation) use ($invoice) {
+                    info("firing email");
                     EmailEntity::dispatch($invitation, $invoice->company, $this->reminder_template);
                     
                 });
diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php
index eae78caf1769..21d5996b9fea 100644
--- a/app/Models/CompanyGateway.php
+++ b/app/Models/CompanyGateway.php
@@ -41,7 +41,7 @@ class CompanyGateway extends BaseModel
         'require_billing_address',
         'require_shipping_address',
         'require_client_name',
-        'require_zip',
+        'require_postal_code',
         'require_client_phone',
         'require_contact_name',
         'update_details',
diff --git a/app/Transformers/CompanyGatewayTransformer.php b/app/Transformers/CompanyGatewayTransformer.php
index 6cc59b8b98f1..c62a54184792 100644
--- a/app/Transformers/CompanyGatewayTransformer.php
+++ b/app/Transformers/CompanyGatewayTransformer.php
@@ -53,6 +53,7 @@ class CompanyGatewayTransformer extends EntityTransformer
             'require_shipping_address' => (bool) $company_gateway->require_shipping_address,
             'require_client_name' => (bool) $company_gateway->require_client_name,
             'require_zip' => (bool) $company_gateway->require_zip,
+            'require_postal_code' => (bool) $company_gateway->require_postal_code,
             'require_client_phone' => (bool) $company_gateway->require_client_phone,
             'require_contact_name' => (bool) $company_gateway->require_contact_name,
             'require_contact_email' => (bool) $company_gateway->require_contact_email,
diff --git a/database/migrations/2020_11_12_104413_company_gateway_rename_column.php b/database/migrations/2020_11_12_104413_company_gateway_rename_column.php
new file mode 100644
index 000000000000..5bc05b56b102
--- /dev/null
+++ b/database/migrations/2020_11_12_104413_company_gateway_rename_column.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CompanyGatewayRenameColumn extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('company_gateways', function(Blueprint $table){
+            $table->renameColumn('require_zip', 'require_postal_code');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}