diff --git a/src/i18n/messages/ar.json b/src/i18n/messages/ar.json
index 43a28b33..88dabce2 100644
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -3,8 +3,9 @@
   "forgot.password.technical.support.help.message": "If you need further assistance, {technicalSupportLink}.",
   "institution.login.page.sub.heading": "Choose your institution from the list below:",
   "forgot.password.confirmation.title": "Check Your Email",
-  "forgot.password.confirmation.support.link": "sign-in",
+  "forgot.password.confirmation.support.link": "contact technical support",
   "forgot.password.confirmation.info": "If you do not receive a password reset message after 1 minute, verify that you entered the correct email address, or check your spam folder.",
+  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your Internet connection.",
   "error.notfound.message": "الصفحة التي تبحث عنها غير متوفرة أو هناك خطأ في نص الرابط. الرجاء التحقق من الرابط والمحاولة مجددا.",
   "login.third.party.auth.account.not.linked.message": "لقد نجحت في تسجيل الدخول إلى {currentProvider}، ولكن حساب {currentProvider} لا يحتوي على حساب {platformName} مرتبط. لربط حساباتك، قم بتسجيل الدخول الآن باستخدام كلمة مرور {platformName}.",
   "register.third.party.auth.account.not.linked.message": "لقد نجحت في تسجيل الدخول إلى {currentProvider}. نحتاج إلى القليل من المعلومات قبل بدء التعلّم مع  {platformName}.",
@@ -12,10 +13,14 @@
   "forgot.password.page.instructions": "Please enter your log-in or recovery email address below and we will send you an email with instructions.",
   "forgot.password.page.invalid.email.message": "The email address you've provided isn't formatted correctly.",
   "forgot.password.page.email.field.label": "Email",
-  "forgot.password.page.email.field.help.text": "The email address you used to register with edX.",
   "forgot.password.page.submit.button": "Recover my password",
-  "forgot.password.page.email.invalid.length.message": "Email must have at least 3 characters.",
-  "forgot.password.request.inprogress.message": "Your previous request is still in progress, please try again in a few moments.",
+  "forgot.password.request.server.error": "Failed to send forgot password email.",
+  "forgot.password.error.message.title": "An error occurred.",
+  "forgot.password.request.in.progress.message": "Your previous request is in progress, please try again in a few moments.",
+  "forgot.password.empty.email.field.error": "Please enter your Email.",
+  "forgot.password.invalid.email": "An error occurred.",
+  "forgot.password.invalid.email.message": "The email address you've provided isn't formatted correctly.",
+  "forgot.password.email.help.text": "The email address you used to register with {platformName}",
   "account.activation.error.message": "Something went wrong, please {supportLink} to resolve this issue.",
   "non.compliant.password.error": "{passwordComplaintRequirements} {lineBreak}Your current password does not meet the new security\n            requirements. We just sent a password-reset message to the email address associated with this account.\n            Thank you for helping us keep your data safe.",
   "login.inactive.user.error": "أنت بحاجة لتنشيط حسابك من أجل تسجيل الدخول {lineBreak}\n{lineBreak}لقد أرسلنا للتو رابط التفعيل إلى البريد الإلكتروني {email}. تحقق من مجلدات الرسائل غير المرغوب فيها أو {supportLink} إذا لم تستلم بريدًا إلكترونيًا.",
@@ -25,7 +30,7 @@
   "other.sign.in.issues": "Other sign-in issues",
   "need.other.help.signing.in.collapsible.menu": "Need other help signing in?",
   "institution.login.button": "Use my university info",
-  "institution.login.page.title": "Sign in with Institution/Campus Credentials",
+  "institution.login.page.title": "Sign in with institution/campus credentials",
   "institution.login.page.back.button": "Back to sign in",
   "create.an.account": "Create an Account",
   "institution.login.sign.in": "Sign In",
@@ -36,7 +41,8 @@
   "email.help.message": "The email address you used to register with edX.",
   "enterprise.login.link.text": "Sign in with your company or school",
   "email.format.validation.message": "The email address you've provided isn't formatted correctly.",
-  "password.validation.message": "Please enter your password.",
+  "email.validation.message": "Please enter your Email.",
+  "password.validation.message": "Please enter your Password.",
   "password.label": "Password (required)",
   "register.link": "Create an account",
   "sign.in.heading": "Sign In",
@@ -45,19 +51,17 @@
   "account.already.activated.message": "This account has already been activated.",
   "account.activation.error.message.title": "Your account could not be activated",
   "account.activation.support.link": "contact support",
-  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your Internet connection.",
   "login.rate.limit.reached.message": "Too many failed login attempts. Try again later.",
   "login.failure.header.title": "We couldn't sign you in.",
   "contact.support.link": "contact {platformName} Support",
   "create.account.button": "Create Account",
   "already.have.an.edx.account": "Already have an edX account?",
-  "sign.in.hyperlink": " Sign in.",
-  "create.an.account.using": "Create an account using",
-  "create.a.new.one.here": "or create a new one here",
+  "sign.in.hyperlink": "Sign in.",
+  "create.an.account.using": "or create an account using",
+  "create.a.new.account": "Create a new account",
   "register.institution.login.button": "Use my institution/campus credentials",
-  "register.institution.login.page.title": "Register with Institution/Campus Credentials",
+  "register.institution.login.page.title": "Register with institution/campus credentials",
   "register.page.email.label": "Email (required)",
-  "email.validation.message": "Please enter your Email.",
   "email.ratelimit.less.chars.validation.message": "Email must have 3 characters.",
   "email.ratelimit.incorrect.format.validation.message": "The email address you provided isn't formatted correctly.",
   "email.ratelimit.password.validation.message": "Your password must contain at least 8 characters",
@@ -68,12 +72,11 @@
   "username.validation.message": "Please enter your Public Username.",
   "username.ratelimit.less.chars.message": "Public Username must have atleast 2 characters.",
   "country.validation.message": "Select your country or region of residence.",
-  "support.education.research": "Support education research by providing additional information",
+  "support.education.research": "Support education research by providing additional information. (Optional)",
   "register.optional.label": "(optional)",
-  "registration.request.failure.header.description.message": "We couldn't create your account.",
-  "reset.password.request.forgot.password.text": "Forgot Password",
-  "reset.password.request.invalid.token.header.message": "Invalid Password Reset Link",
-  "reset.password.request.invalid.token.description.message": "This password reset link is invalid. It may have been used already. To reset your password, go to the {loginPasswordLink} page and select {forgotPassword}",
+  "registration.request.server.error": "An error has occurred. Try refreshing the page, or check your Internet connection.",
+  "registration.request.failure.header": "We couldn't create your account.",
+  "reset.password.request.invalid.token.description.message": "This password reset link is invalid. It may have been used already.\n            To reset your password, go to the {loginPasswordLink} page and select {forgotPassword}",
   "reset.password.page.heading": "Reset your password",
   "reset.password.page.instructions": "Enter and confirm your new password.",
   "reset.password.page.invalid.match.message": "Passwords do not match.",
@@ -81,6 +84,11 @@
   "forgot.password.page.confirm.field.label": "Confirm Password",
   "reset.password.page.submit.button": "Reset my password",
   "reset.password.request.success.header.message": "Password Reset Complete.",
+  "forgot.password.confirmation.sign.in.link": "sign-in",
+  "reset.password.request.forgot.password.text": "Forgot Password",
+  "reset.password.request.invalid.token.header": "Invalid Password Reset Link",
+  "reset.password.empty.new.password.field.error": "Please enter your New Password.",
+  "forgot.password.empty.new.password.error.heading": "We couldn't reset your password.",
   "reset.password.confirmation.support.link": "Sign-in to your account.",
   "reset.password.request.success.header.description.message": "Your password has been reset. {loginPasswordLink}"
 }
\ No newline at end of file
diff --git a/src/i18n/messages/es_419.json b/src/i18n/messages/es_419.json
index 5da1132e..8c3f16da 100644
--- a/src/i18n/messages/es_419.json
+++ b/src/i18n/messages/es_419.json
@@ -3,8 +3,9 @@
   "forgot.password.technical.support.help.message": "If you need further assistance, {technicalSupportLink}.",
   "institution.login.page.sub.heading": "Choose your institution from the list below:",
   "forgot.password.confirmation.title": "Check Your Email",
-  "forgot.password.confirmation.support.link": "sign-in",
+  "forgot.password.confirmation.support.link": "contact technical support",
   "forgot.password.confirmation.info": "If you do not receive a password reset message after 1 minute, verify that you entered the correct email address, or check your spam folder.",
+  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your Internet connection.",
   "error.notfound.message": "La página que estas buscando no está disponible o hay un error en la URL. Por favor, verifica la URL y vuelve a intentarlo.",
   "login.third.party.auth.account.not.linked.message": "You have successfully signed into {currentProvider}, but your {currentProvider} account does not have a linked {platformName} account. To link your accounts, sign in now using your {platformName} password.",
   "register.third.party.auth.account.not.linked.message": "You've successfully signed into {currentProvider}. We just need a little more information before you start learning with {platformName}.",
@@ -12,10 +13,14 @@
   "forgot.password.page.instructions": "Please enter your log-in or recovery email address below and we will send you an email with instructions.",
   "forgot.password.page.invalid.email.message": "The email address you've provided isn't formatted correctly.",
   "forgot.password.page.email.field.label": "Email",
-  "forgot.password.page.email.field.help.text": "The email address you used to register with edX.",
   "forgot.password.page.submit.button": "Recover my password",
-  "forgot.password.page.email.invalid.length.message": "Email must have at least 3 characters.",
-  "forgot.password.request.inprogress.message": "Your previous request is still in progress, please try again in a few moments.",
+  "forgot.password.request.server.error": "Failed to send forgot password email.",
+  "forgot.password.error.message.title": "An error occurred.",
+  "forgot.password.request.in.progress.message": "Your previous request is in progress, please try again in a few moments.",
+  "forgot.password.empty.email.field.error": "Please enter your Email.",
+  "forgot.password.invalid.email": "An error occurred.",
+  "forgot.password.invalid.email.message": "The email address you've provided isn't formatted correctly.",
+  "forgot.password.email.help.text": "The email address you used to register with {platformName}",
   "account.activation.error.message": "Something went wrong, please {supportLink} to resolve this issue.",
   "non.compliant.password.error": "{passwordComplaintRequirements} {lineBreak}Your current password does not meet the new security\n            requirements. We just sent a password-reset message to the email address associated with this account.\n            Thank you for helping us keep your data safe.",
   "login.inactive.user.error": "In order to sign in, you need to activate your account.{lineBreak}\n            {lineBreak}We just sent an activation link to {email}. If you do not receive an email,\n            check your spam folders or {supportLink}.",
@@ -25,7 +30,7 @@
   "other.sign.in.issues": "Other sign-in issues",
   "need.other.help.signing.in.collapsible.menu": "Need other help signing in?",
   "institution.login.button": "Use my university info",
-  "institution.login.page.title": "Sign in with Institution/Campus Credentials",
+  "institution.login.page.title": "Sign in with institution/campus credentials",
   "institution.login.page.back.button": "Back to sign in",
   "create.an.account": "Create an Account",
   "institution.login.sign.in": "Sign In",
@@ -36,7 +41,8 @@
   "email.help.message": "The email address you used to register with edX.",
   "enterprise.login.link.text": "Sign in with your company or school",
   "email.format.validation.message": "The email address you've provided isn't formatted correctly.",
-  "password.validation.message": "Please enter your password.",
+  "email.validation.message": "Please enter your Email.",
+  "password.validation.message": "Please enter your Password.",
   "password.label": "Password (required)",
   "register.link": "Create an account",
   "sign.in.heading": "Sign In",
@@ -45,19 +51,17 @@
   "account.already.activated.message": "This account has already been activated.",
   "account.activation.error.message.title": "Your account could not be activated",
   "account.activation.support.link": "contact support",
-  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your Internet connection.",
   "login.rate.limit.reached.message": "Too many failed login attempts. Try again later.",
   "login.failure.header.title": "We couldn't sign you in.",
   "contact.support.link": "contact {platformName} Support",
   "create.account.button": "Create Account",
   "already.have.an.edx.account": "Already have an edX account?",
-  "sign.in.hyperlink": " Sign in.",
-  "create.an.account.using": "Create an account using",
-  "create.a.new.one.here": "or create a new one here",
+  "sign.in.hyperlink": "Sign in.",
+  "create.an.account.using": "or create an account using",
+  "create.a.new.account": "Create a new account",
   "register.institution.login.button": "Use my institution/campus credentials",
-  "register.institution.login.page.title": "Register with Institution/Campus Credentials",
+  "register.institution.login.page.title": "Register with institution/campus credentials",
   "register.page.email.label": "Email (required)",
-  "email.validation.message": "Please enter your Email.",
   "email.ratelimit.less.chars.validation.message": "Email must have 3 characters.",
   "email.ratelimit.incorrect.format.validation.message": "The email address you provided isn't formatted correctly.",
   "email.ratelimit.password.validation.message": "Your password must contain at least 8 characters",
@@ -68,12 +72,11 @@
   "username.validation.message": "Please enter your Public Username.",
   "username.ratelimit.less.chars.message": "Public Username must have atleast 2 characters.",
   "country.validation.message": "Select your country or region of residence.",
-  "support.education.research": "Support education research by providing additional information",
+  "support.education.research": "Support education research by providing additional information. (Optional)",
   "register.optional.label": "(optional)",
-  "registration.request.failure.header.description.message": "We couldn't create your account.",
-  "reset.password.request.forgot.password.text": "Forgot Password",
-  "reset.password.request.invalid.token.header.message": "Invalid Password Reset Link",
-  "reset.password.request.invalid.token.description.message": "This password reset link is invalid. It may have been used already. To reset your password, go to the {loginPasswordLink} page and select {forgotPassword}",
+  "registration.request.server.error": "An error has occurred. Try refreshing the page, or check your Internet connection.",
+  "registration.request.failure.header": "We couldn't create your account.",
+  "reset.password.request.invalid.token.description.message": "This password reset link is invalid. It may have been used already.\n            To reset your password, go to the {loginPasswordLink} page and select {forgotPassword}",
   "reset.password.page.heading": "Reset your password",
   "reset.password.page.instructions": "Enter and confirm your new password.",
   "reset.password.page.invalid.match.message": "Passwords do not match.",
@@ -81,6 +84,11 @@
   "forgot.password.page.confirm.field.label": "Confirm Password",
   "reset.password.page.submit.button": "Reset my password",
   "reset.password.request.success.header.message": "Password Reset Complete.",
+  "forgot.password.confirmation.sign.in.link": "sign-in",
+  "reset.password.request.forgot.password.text": "Forgot Password",
+  "reset.password.request.invalid.token.header": "Invalid Password Reset Link",
+  "reset.password.empty.new.password.field.error": "Please enter your New Password.",
+  "forgot.password.empty.new.password.error.heading": "We couldn't reset your password.",
   "reset.password.confirmation.support.link": "Sign-in to your account.",
   "reset.password.request.success.header.description.message": "Your password has been reset. {loginPasswordLink}"
 }
\ No newline at end of file
diff --git a/src/i18n/messages/fr.json b/src/i18n/messages/fr.json
index 46def031..e8e314ac 100644
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -3,8 +3,9 @@
   "forgot.password.technical.support.help.message": "If you need further assistance, {technicalSupportLink}.",
   "institution.login.page.sub.heading": "Choose your institution from the list below:",
   "forgot.password.confirmation.title": "Check Your Email",
-  "forgot.password.confirmation.support.link": "sign-in",
+  "forgot.password.confirmation.support.link": "contact technical support",
   "forgot.password.confirmation.info": "If you do not receive a password reset message after 1 minute, verify that you entered the correct email address, or check your spam folder.",
+  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your Internet connection.",
   "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
   "login.third.party.auth.account.not.linked.message": "You have successfully signed into {currentProvider}, but your {currentProvider} account does not have a linked {platformName} account. To link your accounts, sign in now using your {platformName} password.",
   "register.third.party.auth.account.not.linked.message": "You've successfully signed into {currentProvider}. We just need a little more information before you start learning with {platformName}.",
@@ -12,10 +13,14 @@
   "forgot.password.page.instructions": "Please enter your log-in or recovery email address below and we will send you an email with instructions.",
   "forgot.password.page.invalid.email.message": "The email address you've provided isn't formatted correctly.",
   "forgot.password.page.email.field.label": "Email",
-  "forgot.password.page.email.field.help.text": "The email address you used to register with edX.",
   "forgot.password.page.submit.button": "Recover my password",
-  "forgot.password.page.email.invalid.length.message": "Email must have at least 3 characters.",
-  "forgot.password.request.inprogress.message": "Your previous request is still in progress, please try again in a few moments.",
+  "forgot.password.request.server.error": "Failed to send forgot password email.",
+  "forgot.password.error.message.title": "An error occurred.",
+  "forgot.password.request.in.progress.message": "Your previous request is in progress, please try again in a few moments.",
+  "forgot.password.empty.email.field.error": "Please enter your Email.",
+  "forgot.password.invalid.email": "An error occurred.",
+  "forgot.password.invalid.email.message": "The email address you've provided isn't formatted correctly.",
+  "forgot.password.email.help.text": "The email address you used to register with {platformName}",
   "account.activation.error.message": "Something went wrong, please {supportLink} to resolve this issue.",
   "non.compliant.password.error": "{passwordComplaintRequirements} {lineBreak}Your current password does not meet the new security\n            requirements. We just sent a password-reset message to the email address associated with this account.\n            Thank you for helping us keep your data safe.",
   "login.inactive.user.error": "In order to sign in, you need to activate your account.{lineBreak}\n            {lineBreak}We just sent an activation link to {email}. If you do not receive an email,\n            check your spam folders or {supportLink}.",
@@ -25,7 +30,7 @@
   "other.sign.in.issues": "Other sign-in issues",
   "need.other.help.signing.in.collapsible.menu": "Need other help signing in?",
   "institution.login.button": "Use my university info",
-  "institution.login.page.title": "Sign in with Institution/Campus Credentials",
+  "institution.login.page.title": "Sign in with institution/campus credentials",
   "institution.login.page.back.button": "Back to sign in",
   "create.an.account": "Create an Account",
   "institution.login.sign.in": "Sign In",
@@ -36,7 +41,8 @@
   "email.help.message": "The email address you used to register with edX.",
   "enterprise.login.link.text": "Sign in with your company or school",
   "email.format.validation.message": "The email address you've provided isn't formatted correctly.",
-  "password.validation.message": "Please enter your password.",
+  "email.validation.message": "Please enter your Email.",
+  "password.validation.message": "Please enter your Password.",
   "password.label": "Password (required)",
   "register.link": "Create an account",
   "sign.in.heading": "Sign In",
@@ -45,19 +51,17 @@
   "account.already.activated.message": "This account has already been activated.",
   "account.activation.error.message.title": "Your account could not be activated",
   "account.activation.support.link": "contact support",
-  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your Internet connection.",
   "login.rate.limit.reached.message": "Too many failed login attempts. Try again later.",
   "login.failure.header.title": "We couldn't sign you in.",
   "contact.support.link": "contact {platformName} Support",
   "create.account.button": "Create Account",
   "already.have.an.edx.account": "Already have an edX account?",
-  "sign.in.hyperlink": " Sign in.",
-  "create.an.account.using": "Create an account using",
-  "create.a.new.one.here": "or create a new one here",
+  "sign.in.hyperlink": "Sign in.",
+  "create.an.account.using": "or create an account using",
+  "create.a.new.account": "Create a new account",
   "register.institution.login.button": "Use my institution/campus credentials",
-  "register.institution.login.page.title": "Register with Institution/Campus Credentials",
+  "register.institution.login.page.title": "Register with institution/campus credentials",
   "register.page.email.label": "Email (required)",
-  "email.validation.message": "Please enter your Email.",
   "email.ratelimit.less.chars.validation.message": "Email must have 3 characters.",
   "email.ratelimit.incorrect.format.validation.message": "The email address you provided isn't formatted correctly.",
   "email.ratelimit.password.validation.message": "Your password must contain at least 8 characters",
@@ -68,12 +72,11 @@
   "username.validation.message": "Please enter your Public Username.",
   "username.ratelimit.less.chars.message": "Public Username must have atleast 2 characters.",
   "country.validation.message": "Select your country or region of residence.",
-  "support.education.research": "Support education research by providing additional information",
+  "support.education.research": "Support education research by providing additional information. (Optional)",
   "register.optional.label": "(optional)",
-  "registration.request.failure.header.description.message": "We couldn't create your account.",
-  "reset.password.request.forgot.password.text": "Forgot Password",
-  "reset.password.request.invalid.token.header.message": "Invalid Password Reset Link",
-  "reset.password.request.invalid.token.description.message": "This password reset link is invalid. It may have been used already. To reset your password, go to the {loginPasswordLink} page and select {forgotPassword}",
+  "registration.request.server.error": "An error has occurred. Try refreshing the page, or check your Internet connection.",
+  "registration.request.failure.header": "We couldn't create your account.",
+  "reset.password.request.invalid.token.description.message": "This password reset link is invalid. It may have been used already.\n            To reset your password, go to the {loginPasswordLink} page and select {forgotPassword}",
   "reset.password.page.heading": "Reset your password",
   "reset.password.page.instructions": "Enter and confirm your new password.",
   "reset.password.page.invalid.match.message": "Passwords do not match.",
@@ -81,6 +84,11 @@
   "forgot.password.page.confirm.field.label": "Confirm Password",
   "reset.password.page.submit.button": "Reset my password",
   "reset.password.request.success.header.message": "Password Reset Complete.",
+  "forgot.password.confirmation.sign.in.link": "sign-in",
+  "reset.password.request.forgot.password.text": "Forgot Password",
+  "reset.password.request.invalid.token.header": "Invalid Password Reset Link",
+  "reset.password.empty.new.password.field.error": "Please enter your New Password.",
+  "forgot.password.empty.new.password.error.heading": "We couldn't reset your password.",
   "reset.password.confirmation.support.link": "Sign-in to your account.",
   "reset.password.request.success.header.description.message": "Your password has been reset. {loginPasswordLink}"
 }
\ No newline at end of file
diff --git a/src/i18n/messages/zh_CN.json b/src/i18n/messages/zh_CN.json
index 46def031..e8e314ac 100644
--- a/src/i18n/messages/zh_CN.json
+++ b/src/i18n/messages/zh_CN.json
@@ -3,8 +3,9 @@
   "forgot.password.technical.support.help.message": "If you need further assistance, {technicalSupportLink}.",
   "institution.login.page.sub.heading": "Choose your institution from the list below:",
   "forgot.password.confirmation.title": "Check Your Email",
-  "forgot.password.confirmation.support.link": "sign-in",
+  "forgot.password.confirmation.support.link": "contact technical support",
   "forgot.password.confirmation.info": "If you do not receive a password reset message after 1 minute, verify that you entered the correct email address, or check your spam folder.",
+  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your Internet connection.",
   "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
   "login.third.party.auth.account.not.linked.message": "You have successfully signed into {currentProvider}, but your {currentProvider} account does not have a linked {platformName} account. To link your accounts, sign in now using your {platformName} password.",
   "register.third.party.auth.account.not.linked.message": "You've successfully signed into {currentProvider}. We just need a little more information before you start learning with {platformName}.",
@@ -12,10 +13,14 @@
   "forgot.password.page.instructions": "Please enter your log-in or recovery email address below and we will send you an email with instructions.",
   "forgot.password.page.invalid.email.message": "The email address you've provided isn't formatted correctly.",
   "forgot.password.page.email.field.label": "Email",
-  "forgot.password.page.email.field.help.text": "The email address you used to register with edX.",
   "forgot.password.page.submit.button": "Recover my password",
-  "forgot.password.page.email.invalid.length.message": "Email must have at least 3 characters.",
-  "forgot.password.request.inprogress.message": "Your previous request is still in progress, please try again in a few moments.",
+  "forgot.password.request.server.error": "Failed to send forgot password email.",
+  "forgot.password.error.message.title": "An error occurred.",
+  "forgot.password.request.in.progress.message": "Your previous request is in progress, please try again in a few moments.",
+  "forgot.password.empty.email.field.error": "Please enter your Email.",
+  "forgot.password.invalid.email": "An error occurred.",
+  "forgot.password.invalid.email.message": "The email address you've provided isn't formatted correctly.",
+  "forgot.password.email.help.text": "The email address you used to register with {platformName}",
   "account.activation.error.message": "Something went wrong, please {supportLink} to resolve this issue.",
   "non.compliant.password.error": "{passwordComplaintRequirements} {lineBreak}Your current password does not meet the new security\n            requirements. We just sent a password-reset message to the email address associated with this account.\n            Thank you for helping us keep your data safe.",
   "login.inactive.user.error": "In order to sign in, you need to activate your account.{lineBreak}\n            {lineBreak}We just sent an activation link to {email}. If you do not receive an email,\n            check your spam folders or {supportLink}.",
@@ -25,7 +30,7 @@
   "other.sign.in.issues": "Other sign-in issues",
   "need.other.help.signing.in.collapsible.menu": "Need other help signing in?",
   "institution.login.button": "Use my university info",
-  "institution.login.page.title": "Sign in with Institution/Campus Credentials",
+  "institution.login.page.title": "Sign in with institution/campus credentials",
   "institution.login.page.back.button": "Back to sign in",
   "create.an.account": "Create an Account",
   "institution.login.sign.in": "Sign In",
@@ -36,7 +41,8 @@
   "email.help.message": "The email address you used to register with edX.",
   "enterprise.login.link.text": "Sign in with your company or school",
   "email.format.validation.message": "The email address you've provided isn't formatted correctly.",
-  "password.validation.message": "Please enter your password.",
+  "email.validation.message": "Please enter your Email.",
+  "password.validation.message": "Please enter your Password.",
   "password.label": "Password (required)",
   "register.link": "Create an account",
   "sign.in.heading": "Sign In",
@@ -45,19 +51,17 @@
   "account.already.activated.message": "This account has already been activated.",
   "account.activation.error.message.title": "Your account could not be activated",
   "account.activation.support.link": "contact support",
-  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your Internet connection.",
   "login.rate.limit.reached.message": "Too many failed login attempts. Try again later.",
   "login.failure.header.title": "We couldn't sign you in.",
   "contact.support.link": "contact {platformName} Support",
   "create.account.button": "Create Account",
   "already.have.an.edx.account": "Already have an edX account?",
-  "sign.in.hyperlink": " Sign in.",
-  "create.an.account.using": "Create an account using",
-  "create.a.new.one.here": "or create a new one here",
+  "sign.in.hyperlink": "Sign in.",
+  "create.an.account.using": "or create an account using",
+  "create.a.new.account": "Create a new account",
   "register.institution.login.button": "Use my institution/campus credentials",
-  "register.institution.login.page.title": "Register with Institution/Campus Credentials",
+  "register.institution.login.page.title": "Register with institution/campus credentials",
   "register.page.email.label": "Email (required)",
-  "email.validation.message": "Please enter your Email.",
   "email.ratelimit.less.chars.validation.message": "Email must have 3 characters.",
   "email.ratelimit.incorrect.format.validation.message": "The email address you provided isn't formatted correctly.",
   "email.ratelimit.password.validation.message": "Your password must contain at least 8 characters",
@@ -68,12 +72,11 @@
   "username.validation.message": "Please enter your Public Username.",
   "username.ratelimit.less.chars.message": "Public Username must have atleast 2 characters.",
   "country.validation.message": "Select your country or region of residence.",
-  "support.education.research": "Support education research by providing additional information",
+  "support.education.research": "Support education research by providing additional information. (Optional)",
   "register.optional.label": "(optional)",
-  "registration.request.failure.header.description.message": "We couldn't create your account.",
-  "reset.password.request.forgot.password.text": "Forgot Password",
-  "reset.password.request.invalid.token.header.message": "Invalid Password Reset Link",
-  "reset.password.request.invalid.token.description.message": "This password reset link is invalid. It may have been used already. To reset your password, go to the {loginPasswordLink} page and select {forgotPassword}",
+  "registration.request.server.error": "An error has occurred. Try refreshing the page, or check your Internet connection.",
+  "registration.request.failure.header": "We couldn't create your account.",
+  "reset.password.request.invalid.token.description.message": "This password reset link is invalid. It may have been used already.\n            To reset your password, go to the {loginPasswordLink} page and select {forgotPassword}",
   "reset.password.page.heading": "Reset your password",
   "reset.password.page.instructions": "Enter and confirm your new password.",
   "reset.password.page.invalid.match.message": "Passwords do not match.",
@@ -81,6 +84,11 @@
   "forgot.password.page.confirm.field.label": "Confirm Password",
   "reset.password.page.submit.button": "Reset my password",
   "reset.password.request.success.header.message": "Password Reset Complete.",
+  "forgot.password.confirmation.sign.in.link": "sign-in",
+  "reset.password.request.forgot.password.text": "Forgot Password",
+  "reset.password.request.invalid.token.header": "Invalid Password Reset Link",
+  "reset.password.empty.new.password.field.error": "Please enter your New Password.",
+  "forgot.password.empty.new.password.error.heading": "We couldn't reset your password.",
   "reset.password.confirmation.support.link": "Sign-in to your account.",
   "reset.password.request.success.header.description.message": "Your password has been reset. {loginPasswordLink}"
 }
\ No newline at end of file