diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000000..8aab1edc58db
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,4 @@
+# Invoice Ninja Code of Conduct
+
+The development team has invested a tremendous amount of time and energy into this project. While we appreciate that bugs can be frustrating we ask that our community refrain from insults and snide remarks. We're happy to provide support to both our hosted and selfhosted communities but ask that feedback is always polite.
+
diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php
index 21ff2e0e5391..fbd98d267c84 100644
--- a/app/Traits/GenerateMigrationResources.php
+++ b/app/Traits/GenerateMigrationResources.php
@@ -880,7 +880,7 @@ info("get company");
                 'key' => $invitation->invitation_key,
                 'transaction_reference' => $invitation->transaction_reference,
                 'message_id' => $invitation->message_id,
-                'email_error' => $invitation->email_error,
+                'email_error' => $invitation->email_error ?: '',
                 'signature_base64' => $invitation->signature_base64,
                 'signature_date' => $invitation->signature_date,
                 'sent_date' => $invitation->sent_date,
@@ -889,6 +889,7 @@ info("get company");
                 'created_at' => $invitation->created_at ? Carbon::parse($invitation->created_at)->toDateString() : null,
                 'updated_at' => $invitation->updated_at ? Carbon::parse($invitation->updated_at)->toDateString() : null,
                 'deleted_at' => $invitation->deleted_at ? Carbon::parse($invitation->deleted_at)->toDateString() : null,
+                'email_status' => '',
             ];
         }
 
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 89eb1dea148f..062a1828dc4b 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -4282,6 +4282,10 @@ $LANG = array(
     'notification_credit_created_subject' => 'Credit :invoice was created to :client',
     'notification_credit_created_subject' => 'Credit :invoice was created for :client',
     'migration_create_account_notice' => 'Please ensure you have created an account on the new platform first <a href="https://invoicing.co">here</a> , please ensure that the credentials are <b>identical</b> to your v4 credentials. Once the account has been created, you can start the migration process here.',
+    'auth' => 'Authentication',
+    'companies' => 'Select companies for migration',
+    
+
 );
 
 return $LANG;