diff --git a/app/Http/Controllers/Migration/StepsController.php b/app/Http/Controllers/Migration/StepsController.php
index 8c4cbd42ed4d..fdd89b1301e5 100644
--- a/app/Http/Controllers/Migration/StepsController.php
+++ b/app/Http/Controllers/Migration/StepsController.php
@@ -176,18 +176,22 @@ class StepsController extends BaseController
             );
         }
 
-        $migrationData = $this->generateMigrationData($request->all());
+        try {
+            $migrationData = $this->generateMigrationData($request->all());
 
-        $completeService = (new CompleteService(session('MIGRATION_ACCOUNT_TOKEN')))
-            ->data($migrationData)
-            ->endpoint(session('MIGRATION_ENDPOINT'))
-            ->start();
-
-        if ($completeService->isSuccessful()) {
-            return view('migration.completed');
+            $completeService = (new CompleteService(session('MIGRATION_ACCOUNT_TOKEN')))
+                ->data($migrationData)
+                ->endpoint(session('MIGRATION_ENDPOINT'))
+                ->start();
         }
+        finally {
+        
+            if ($completeService->isSuccessful()) {
+                return view('migration.completed');
+            }
 
-        return view('migration.completed', ['customMessage' => $completeService->getErrors()[0]]);
+            return view('migration.completed', ['customMessage' => $completeService->getErrors()[0]]);
+        }
     }
 
     public function completed()
@@ -223,6 +227,8 @@ class StepsController extends BaseController
      */
     public function generateMigrationData(array $data): array
     {
+        set_time_limit(0);
+
         $migrationData = [];
 
         foreach ($data['companies'] as $company) {
diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php
index aedc64486227..0bac5b2a816c 100644
--- a/app/Traits/GenerateMigrationResources.php
+++ b/app/Traits/GenerateMigrationResources.php
@@ -538,8 +538,14 @@ info("get company");
         elseif($design_id == 1)
             return 2;
         elseif($design_id == 2)
+            return 3;
+        elseif($design_id == 3)
+            return 4;
+        elseif($design_id == 4)
             return 1;
-
+        elseif($design_id == 10)
+            return 2;
+        
         return $design_id;
     }
 
@@ -1297,6 +1303,8 @@ info("translated gateway_type = {$translated_gateway_type}");
                 $config = Crypt::decrypt($account_gateway->config);
             }
             catch(\Exception $e){
+            
+                info($config);
 
             }
 
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 062a1828dc4b..59df8076a518 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -4284,7 +4284,11 @@ $LANG = array(
     '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',
-    
+    'activity_100' => ':user created recurring invoice :recurring_invoice',
+    'activity_101' => ':user updated recurring invoice :recurring_invoice',
+    'activity_102' => ':user archived recurring invoice :recurring_invoice',
+    'activity_103' => ':user deleted recurring invoice :recurring_invoice',
+    'activity_104' => ':user restored recurring invoice :recurring_invoice',
 
 );