diff --git a/app/Http/Controllers/TwoFactorController.php b/app/Http/Controllers/TwoFactorController.php
index 4b0a07717b30..1724b332a63f 100644
--- a/app/Http/Controllers/TwoFactorController.php
+++ b/app/Http/Controllers/TwoFactorController.php
@@ -53,13 +53,21 @@ class TwoFactorController extends BaseController
         $secret = request()->input('secret');
         $oneTimePassword = request()->input('one_time_password');
 
-        if (! $secret || ! $google2fa->verifyKey($secret, $oneTimePassword)) {
-            return response()->json('message' > ctrans('texts.invalid_one_time_password'));
-        } elseif (! $user->google_2fa_secret && $user->phone && $user->confirmed) {
+        if($google2fa->verifyKey($secret, $oneTimePassword) && $user->phone && $user->confirmed){
+
             $user->google_2fa_secret = encrypt($secret);
             $user->save();
-        }
+        
+            return response()->json(['message' => ctrans('texts.enabled_two_factor')], 200);
 
-        return response()->json(['message' => ctrans('texts.enabled_two_factor')], 200);
+        } elseif (! $secret || ! $google2fa->verifyKey($secret, $oneTimePassword)) {
+
+            return response()->json(['message' => ctrans('texts.invalid_one_time_password')]);
+
+        } 
+            
+        return response()->json(['message' => 'No phone record or user is not confirmed']);
+        
     }
+    
 }
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 9dd7f19fabca..d2d6a4616dbe 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -4167,6 +4167,9 @@ $LANG = array(
      'zoho' => 'Zoho',
      'accounting' => 'Accounting',
      'required_files_missing' => 'Please provide all CSVs.',
+     'migration_auth_label' => 'Let\'s continue by authenticating.',
+     '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.',
 );
 
 return $LANG;