diff --git a/app/Http/Controllers/Migration/StepsController.php b/app/Http/Controllers/Migration/StepsController.php
index c70ee7ac6584..b0011db0333b 100644
--- a/app/Http/Controllers/Migration/StepsController.php
+++ b/app/Http/Controllers/Migration/StepsController.php
@@ -232,6 +232,8 @@ class StepsController extends BaseController
                 'tax_rates' => $this->getTaxRates(),
                 'payment_terms' => $this->getPaymentTerms(),
                 'clients' => $this->getClients(),
+                'company_gateways' => $this->getCompanyGateways(),
+                'client_gateway_tokens' => $this->getClientGatewayTokens(),
                 'vendors' => $this->getVendors(),
                 'projects' => $this->getProjects(),
                 'products' => $this->getProducts(),
@@ -241,8 +243,6 @@ class StepsController extends BaseController
                 'quotes' => $this->getQuotes(),
                 'payments' => array_merge($this->getPayments(), $this->getCredits()),
                 'documents' => $this->getDocuments(),
-                'company_gateways' => $this->getCompanyGateways(),
-                'client_gateway_tokens' => $this->getClientGatewayTokens(),
                 'expense_categories' => $this->getExpenseCategories(),
                 'task_statuses' => $this->getTaskStatuses(),
                 'expenses' => $this->getExpenses(),
diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php
index 43c1345e102b..7ed2d7bc5ce4 100644
--- a/app/Traits/GenerateMigrationResources.php
+++ b/app/Traits/GenerateMigrationResources.php
@@ -1031,7 +1031,7 @@ trait GenerateMigrationResources
         {
             if($gateway_type == 'token')
                 continue;
-            
+
             $fees_and_limits = $this->transformFeesAndLimits($gateway_type);
 
             $translated_gateway_type = $this->translateGatewayTypeId($gateway_type);
@@ -1655,7 +1655,7 @@ trait GenerateMigrationResources
             case 4;
                 return 4;
             case 5:
-                return 1; // ?
+                return 2; // ?
             case 6:
                 return 5;
             case 7: