diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php
index 3d11955ead..3cda0e6ad2 100644
--- a/app/Jobs/Company/CompanyExport.php
+++ b/app/Jobs/Company/CompanyExport.php
@@ -149,7 +149,7 @@ class CompanyExport implements ShouldQueue
 
         $this->export_data['client_gateway_tokens'] = $this->company->client_gateway_tokens->map(function ($client_gateway_token){
 
-            $client_gateway_token = $this->transformArrayOfKeys($client_gateway_token, ['company_id', 'client_id']);
+            $client_gateway_token = $this->transformArrayOfKeys($client_gateway_token, ['company_id', 'client_id', 'company_gateway_id']);
 
             return $client_gateway_token->makeVisible(['id']);
 
diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php
index da8f22a28c..8eb40800f5 100644
--- a/app/Jobs/Company/CompanyImport.php
+++ b/app/Jobs/Company/CompanyImport.php
@@ -688,7 +688,7 @@ class CompanyImport implements ShouldQueue
 
         $this->genericNewClassImport(ClientGatewayToken::class, 
             ['company_id', 'id', 'hashed_id','client_id'], 
-            [['clients' => 'client_id']], 
+            [['clients' => 'client_id', 'company_gateways' => 'company_gateway_id']], 
             'client_gateway_tokens');
 
         return $this;        
@@ -1235,7 +1235,6 @@ class CompanyImport implements ShouldQueue
 
         $class::unguard();
 
-        // foreach($this->backup_file->{$object_property} as $obj)
         foreach((object)$this->getObject($object_property) as $obj)
         {
             /* Remove unwanted keys*/
@@ -1270,7 +1269,7 @@ class CompanyImport implements ShouldQueue
                         $activity_invitation_key = 'invoice_invitations';
                     elseif(isset($obj->quote_id))
                         $activity_invitation_key = 'quote_invitations';
-                    elseif($isset($obj->credit_id))
+                    elseif(isset($obj->credit_id))
                         $activity_invitation_key  = 'credit_invitations';
 
                 }