diff --git a/src/forgot-password/ForgotPasswordPage.jsx b/src/forgot-password/ForgotPasswordPage.jsx
index 67f97ffa..2b4b3e20 100644
--- a/src/forgot-password/ForgotPasswordPage.jsx
+++ b/src/forgot-password/ForgotPasswordPage.jsx
@@ -91,6 +91,7 @@ const ForgotPasswordPage = (props) => {
                   value={values.email}
                   handleBlur={() => getValidationMessage(values.email)}
                   handleChange={e => setFieldValue('email', e.target.value)}
+                  handleFocus={() => setValidationError('')}
                   helpText={[intl.formatMessage(messages['forgot.password.email.help.text'], { platformName })]}
                 />
                 <StatefulButton
diff --git a/src/reset-password/ResetPasswordPage.jsx b/src/reset-password/ResetPasswordPage.jsx
index 65565077..465fd472 100644
--- a/src/reset-password/ResetPasswordPage.jsx
+++ b/src/reset-password/ResetPasswordPage.jsx
@@ -85,7 +85,7 @@ const ResetPasswordPage = (props) => {
   };
 
   const handleOnFocus = (e) => {
-    setFormErrors({ [e.target.name]: '' });
+    setFormErrors({ ...formErrors, [e.target.name]: '' });
   };
 
   const handleSubmit = (e) => {