diff --git a/src/controllers/forgotpassword.js b/src/controllers/forgotpassword.js
index fc944a410a..f31c5724a7 100644
--- a/src/controllers/forgotpassword.js
+++ b/src/controllers/forgotpassword.js
@@ -12,7 +12,7 @@ define([], function() {
         });
         if ("PinCode" == result.Action) {
             var msg = Globalize.translate("MessageForgotPasswordFileCreated");
-            return msg += "<br/>", msg += "<br/>", msg += result.PinFile, msg += "<br/>", void Dashboard.alert({
+            return msg += "<br/>", msg += "<br/>", msg += "<a href=\"/web/index.html#!/forgotpasswordpin.html\">Enter PIN here to finish Password Reset</a>" ,msg += "<br/>",msg += result.PinFile, msg += "<br/>", void Dashboard.alert({
                 message: msg,
                 title: Globalize.translate("HeaderForgotPassword")
             })
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 765e74cf86..cdaba76e06 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -40,6 +40,7 @@
     "AspectRatio": "Aspect ratio",
     "AttributeNew": "New",
     "Audio": "Audio",
+    "AuthProviderHelp": "Select an Authentication Provider to be used to Authenticate this user's password",
     "Auto": "Auto",
     "AutoBasedOnLanguageSetting": "Auto (based on language setting)",
     "Backdrop": "Backdrop",
@@ -548,6 +549,7 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "LabelAudio": "Audio:",
     "LabelAudioLanguagePreference": "Preferred audio language:",
+    "LabelAuthProvider": "Authentication Provider:",
     "LabelAutomaticallyRefreshInternetMetadataEvery": "Automatically refresh metadata from the internet:",
     "LabelBindToLocalNetworkAddress": "Bind to local network address:",
     "LabelBindToLocalNetworkAddressHelp": "Optional. Override the local IP address to bind the http server to. If left empty, the server will bind to all availabile addresses. Changing this value requires restarting Jellyfin Server.",
@@ -746,6 +748,7 @@
     "LabelParentalRating": "Parental rating:",
     "LabelPassword": "Password:",
     "LabelPasswordConfirm": "Password (confirm):",
+    "LabelPasswordResetProvider": "Password Reset Provider:",
     "LabelPasswordRecoveryPinCode": "Pin code:",
     "LabelPath": "Path:",
     "LabelPersonRole": "Role:",
@@ -961,7 +964,7 @@
     "MessageNoServersAvailableToConnect": "No servers are available to connect to. If you've been invited to share a server, make sure to accept it below or by clicking the link in the email.",
     "MessageNoTrailersFound": "No trailers found. Install the Trailer channel to enhance your movie experience by adding a library of internet trailers.",
     "MessageNothingHere": "Nothing here.",
-    "MessagePasswordResetForUsers": "Passwords have been removed for the following users. To login, sign in with a blank password.",
+    "MessagePasswordResetForUsers": "The following users have had their passwords reset. They can now sign in with the PIN code that was used this reset.",
     "MessagePlayAccessRestricted": "Playback of this content is currently restricted. Please contact your Jellyfin Server administrator for more information.",
     "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
     "MessagePleaseWait": "Please wait. This may take a minute.",
@@ -1170,6 +1173,7 @@
     "PasswordResetComplete": "The password has been reset.",
     "PasswordResetConfirmation": "Are you sure you wish to reset the password?",
     "PasswordResetHeader": "Reset Password",
+    "PasswordResetProviderHelp": "Choose a Password Reset Provider to be used if this user resets their password",
     "PasswordSaved": "Password saved.",
     "People": "People",
     "PerfectMatch": "Perfect match",