diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js
index 809ca4e2c2f6..57c83c1b1b99 100644
--- a/src/libs/actions/User.js
+++ b/src/libs/actions/User.js
@@ -135,6 +135,7 @@ function requestContactMethodValidateCode(contactMethod) {
                     validateCodeSent: false,
                     errorFields: {
                         validateCodeSent: null,
+                        validateLogin: null,
                     },
                     pendingFields: {
                         validateCodeSent: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
diff --git a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
index 53049a73d959..6b91096706de 100644
--- a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
+++ b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
@@ -79,6 +79,8 @@ function BaseValidateCodeForm(props) {
      */
     const resendValidateCode = () => {
         User.requestContactMethodValidateCode(props.contactMethod);
+        setValidateCode('');
+        inputValidateCodeRef.current.focus();
     };
 
     /**