diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php
index 975c0ea349cf..21ff2e0e5391 100644
--- a/app/Traits/GenerateMigrationResources.php
+++ b/app/Traits/GenerateMigrationResources.php
@@ -1286,6 +1286,15 @@ info("translated gateway_type = {$translated_gateway_type}");
 
             $gateway_types = $account_gateway->paymentDriver()->gatewayTypes();
 
+            $config = 'If you see this message - we were not able to decrypt your config';
+
+            try{
+                $config = Crypt::decrypt($account_gateway->config);
+            }
+            catch(\Exception $e){
+
+            }
+
             // foreach ($gateway_types as $gateway_type_id) {
                 $transformed[] = [
                     'id' => $account_gateway->id,
@@ -1297,7 +1306,7 @@ info("translated gateway_type = {$translated_gateway_type}");
                     'require_billing_address' => $account_gateway->show_billing_address,
                     'require_shipping_address' => $account_gateway->show_shipping_address,
                     'update_details' => $account_gateway->update_details,
-                    'config' => Crypt::decrypt($account_gateway->config),
+                    'config' => $config,
                     'fees_and_limits' => $this->buildFeesAndLimits($gateway_types),
                     'custom_value1' => '',
                     'custom_value2' => '',
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 42c66fa2fb4e..89eb1dea148f 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -4175,7 +4175,7 @@ $LANG = array(
      'zoho' => 'Zoho',
      'accounting' => 'Accounting',
      'required_files_missing' => 'Please provide all CSVs.',
-     'migration_auth_label' => 'Let\'s continue by authenticating.',
+     'migration_auth_label' => 'Let\'s continue by authenticating. (These credentials should be identical across systems)',
      'api_secret' => 'API secret',
      'migration_api_secret_notice' => 'You can find API_SECRET in the .env file or Invoice Ninja v5. If property is missing, leave field blank.',
      'billing_coupon_notice' => 'Your discount will be applied on the checkout.',
diff --git a/resources/views/migration/auth.blade.php b/resources/views/migration/auth.blade.php
index 9e4c208c708f..324010f25431 100644
--- a/resources/views/migration/auth.blade.php
+++ b/resources/views/migration/auth.blade.php
@@ -11,7 +11,11 @@
             <h3 class="panel-title">{!! trans('texts.welcome_to_the_new_version') !!}</h3>
         </div>
         <div class="panel-body">
+            @if(Utils::isNinjaProd())
             <h4>{!! trans('texts.migration_create_account_notice') !!}</h4><br/>
+            @else
+            <h4>{!! trans('texts.migration_auth_label')!!}</h4>
+            @endif
             <form action="{{ url('/migration/auth') }}" method="post" id="auth-form">
                 {{ csrf_field() }}