diff --git a/src/apps/stable/routes/session/forgotPassword/index.tsx b/src/apps/stable/routes/session/forgotPassword/index.tsx
index eff26d340..55a0c3ff6 100644
--- a/src/apps/stable/routes/session/forgotPassword/index.tsx
+++ b/src/apps/stable/routes/session/forgotPassword/index.tsx
@@ -45,7 +45,19 @@ export const ForgotPasswordPage = () => {
             }
 
             if (result.Action == 'PinCode') {
-                navigate('/forgotpasswordpin');
+                let msg = globalize.translate('MessageForgotPasswordFileCreated');
+                msg += '<br/><br/>';
+                msg += globalize.translate('MessageForgotPasswordPinReset');
+                msg += '<br/><br/>';
+                msg += result.PinFile;
+                msg += '<br/>';
+                Dashboard.alert({
+                    message: msg,
+                    title: globalize.translate('ButtonForgotPassword'),
+                    callback: function () {
+                        navigate('forgotpasswordpin');
+                    }
+                });
             }
         }
     });
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 9f6e69f1c..62d49a750 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1127,6 +1127,7 @@
     "MessageEnablingOptionLongerScans": "Enabling this option may result in significantly longer library scans.",
     "MessageFileReadError": "There was an error reading the file. Please try again.",
     "MessageForgotPasswordFileCreated": "The following file has been created on your server and contains instructions on how to proceed",
+    "MessageForgotPasswordPinReset": "Enter PIN here to finish Password reset",
     "MessageForgotPasswordInNetworkRequired": "Please try again within your home network to initiate the password reset process.",
     "MessageGetInstalledPluginsError": "An error occurred while getting the list of currently installed plugins.",
     "MessageImageFileTypeAllowed": "Only JPEG and PNG files are supported.",
diff --git a/src/strings/es.json b/src/strings/es.json
index 5870de605..803721341 100644
--- a/src/strings/es.json
+++ b/src/strings/es.json
@@ -714,6 +714,7 @@
     "MessageEnablingOptionLongerScans": "Activar esta opción implicará escaneos de la biblioteca más largos.",
     "MessageFileReadError": "Ha habido un error leyendo el fichero. Por favor, inténtalo más tarde.",
     "MessageForgotPasswordFileCreated": "Se ha creado el siguiente archivo en tu servidor y contiene instrucciones de cómo proceder",
+    "MessageForgotPasswordPinReset": "Introdice el PIN aqui para finalizar el reseteo de contraseña",
     "MessageForgotPasswordInNetworkRequired": "Por favor, inténtalo de nuevo desde tu red de casa para iniciar el proceso de restablecimiento de la contraseña.",
     "MessageInvalidForgotPasswordPin": "Has introducido un código PIN inválido o expirado. Por favor, inténtalo de nuevo.",
     "MessageInvalidUser": "Usuario o contraseña inválidos. Por favor, inténtalo otra vez.",