diff --git a/.vscode/launch.json b/.vscode/launch.json
index 0e2049e9..8fd97968 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -53,7 +53,7 @@
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
         "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
-        "AYANOVA_SERVER_TEST_MODE": "false",
+        "AYANOVA_SERVER_TEST_MODE": "true",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"
diff --git a/server/AyaNova/Controllers/AuthController.cs b/server/AyaNova/Controllers/AuthController.cs
index ec02908f..a5b7fadb 100644
--- a/server/AyaNova/Controllers/AuthController.cs
+++ b/server/AyaNova/Controllers/AuthController.cs
@@ -198,9 +198,15 @@ namespace AyaNova.Api.Controllers
                     //if 2fa enabled then need to validate it before sending token, so we're halfway there and need to send a 2fa prompt
                     if (u.TwoFactorEnabled)
                     {
+                        List<string> TranslationKeysToFetch = new List<string> { "AuthTwoFactor", "AuthEnterPin", "AuthVerifyCode", "Cancel" };
+                        var LT = await TranslationBiz.GetSubsetStaticAsync(TranslationKeysToFetch, u.UserOptions.TranslationId);
 
                         return Ok(ApiOkResponse.Response(new
                         {
+                            AuthTwoFactor = LT["AuthTwoFactor"],
+                            AuthEnterPin = LT["AuthEnterPin"],
+                            AuthVerifyCode = LT["AuthVerifyCode"],
+                            Cancel = LT["Cancel"],
                             tfa = true
                         }));
                     }
diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json
index 14520b40..b81cbbde 100644
--- a/server/AyaNova/resource/de.json
+++ b/server/AyaNova/resource/de.json
@@ -2169,9 +2169,10 @@
   "AuthConnectAppTitle": "Verbinden Sie Ihre App",
   "AuthConnectAppSubTitle": "Scannen Sie den QR-Code mit einer Authentifizierungs-App wie Google Authenticator, Duo, Microsoft Authenticator oder Authy. Es wird ein 6-stelliger Passcode angezeigt, den Sie unten eingeben müssen.",
   "AuthConnectAppManualEntry":"Haben Sie Probleme beim Scannen des Codes? Geben Sie Folgendes manuell in Ihre Authentifizierungs-App ein:",
-  "AuthEnterPin":"Geben Sie den 6-stelligen Passcode ein",
-  "AuthPinInvalid":"Passcode ungültig",
+  "AuthEnterPin":"Geben Sie einen 6-stelligen Code ein",
+  "AuthPinInvalid":"Code ungültig",
   "AuthConnectCompleted":"Die Zwei-Faktor-Authentifizierung ist jetzt aktiviert",
   "AuthDisableTwoFactor":"Deaktivieren Sie die Zwei-Faktor-Authentifizierung",
-  "AuthTwoFactorDisabled":"Die Zwei-Faktor-Authentifizierung ist jetzt deaktiviert"
+  "AuthTwoFactorDisabled":"Die Zwei-Faktor-Authentifizierung ist jetzt deaktiviert",
+  "AuthVerifyCode":"Code überprüfen"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json
index 1b77cf87..0d72c463 100644
--- a/server/AyaNova/resource/en.json
+++ b/server/AyaNova/resource/en.json
@@ -2169,9 +2169,10 @@
   "AuthConnectAppTitle": "Connect your app",
   "AuthConnectAppSubTitle": "Using an authenticator app such as Google Authenticator, Duo, Microsoft Authenticator, Authy etc, scan the QR code. It will display a 6 digit pass code which you need to enter below.",
   "AuthConnectAppManualEntry":"Having trouble scanning the code? Enter the following manually into your authenticator app:",
-  "AuthEnterPin":"Enter 6 digit pass code",
-  "AuthPinInvalid":"Pass code not valid",
+  "AuthEnterPin":"Enter 6-digit code",
+  "AuthPinInvalid":"Code not valid",
   "AuthConnectCompleted":"Two-Factor authentication is now enabled",
   "AuthDisableTwoFactor":"Disable Two-Factor authentication",
-  "AuthTwoFactorDisabled":"Two-Factor authentication is now disabled"
+  "AuthTwoFactorDisabled":"Two-Factor authentication is now disabled",
+  "AuthVerifyCode":"Verify code"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json
index 3cf6df83..ffca7f51 100644
--- a/server/AyaNova/resource/es.json
+++ b/server/AyaNova/resource/es.json
@@ -2169,9 +2169,10 @@
   "AuthConnectAppTitle": "Conecta tu aplicación",
   "AuthConnectAppSubTitle": "Con una aplicación de autenticación como Google Authenticator, Duo, Microsoft Authenticator o Authy, escanee el código QR. Aparecerá un código de acceso de 6 dígitos que debe ingresar a continuación.",
   "AuthConnectAppManualEntry":"¿Tiene problemas para escanear el código? Ingrese lo siguiente manualmente en su aplicación de autenticación:",
-  "AuthEnterPin":"Ingrese un código de acceso de 6 dígitos",
-  "AuthPinInvalid":"Código de acceso no válido",
+  "AuthEnterPin":"Ingrese un código de 6 dígitos",
+  "AuthPinInvalid":"Código no válido",
   "AuthConnectCompleted":"La autenticación de dos factores ahora está habilitada",
   "AuthDisableTwoFactor":"Deshabilitar la autenticación de dos factores",
-  "AuthTwoFactorDisabled":"La autenticación de dos factores ahora está deshabilitada"
+  "AuthTwoFactorDisabled":"La autenticación de dos factores ahora está deshabilitada",
+  "AuthVerifyCode":"Código de verificación"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json
index d6e66029..4b952c3b 100644
--- a/server/AyaNova/resource/fr.json
+++ b/server/AyaNova/resource/fr.json
@@ -2169,9 +2169,10 @@
   "AuthConnectAppTitle": "Connectez votre application",
   "AuthConnectAppSubTitle": "À l'aide d'une application d'authentification telle que Google Authenticator, Duo, Microsoft Authenticator ou Authy, scannez le code QR. Il affichera un code d'accès à 6 chiffres que vous devez saisir ci-dessous.",
   "AuthConnectAppManualEntry":"Vous rencontrez des difficultés pour scanner le code? Saisissez les informations suivantes manuellement dans votre application d'authentification:",
-  "AuthEnterPin":"Entrez le code d'accès à 6 chiffres",
-  "AuthPinInvalid":"Code d'accès non valide",
+  "AuthEnterPin":"Entrez le code à 6 chiffres",
+  "AuthPinInvalid":"Code non valide",
   "AuthConnectCompleted":"L'authentification à deux facteurs est maintenant activée",
   "AuthDisableTwoFactor":"Désactiver l'authentification à deux facteurs",
-  "AuthTwoFactorDisabled":"L'authentification à deux facteurs est maintenant désactivée"
+  "AuthTwoFactorDisabled":"L'authentification à deux facteurs est maintenant désactivée",
+  "AuthVerifyCode":"Vérifier le code"
 }
\ No newline at end of file