diff --git a/frontend/src/ForgotPassword/ForgotPasswordPage.jsx b/frontend/src/ForgotPassword/ForgotPasswordPage.jsx
index e55f778d19..da646121a7 100644
--- a/frontend/src/ForgotPassword/ForgotPasswordPage.jsx
+++ b/frontend/src/ForgotPassword/ForgotPasswordPage.jsx
@@ -23,7 +23,6 @@ class ForgotPassword extends React.Component {
   };
 
   handleClick = (event) => {
-    this.setState({ buttonClicked: true });
     event.preventDefault();
 
     fetch(`${config.apiUrl}/forgot_password`, {
@@ -38,6 +37,7 @@ class ForgotPassword extends React.Component {
           this.setState({ isEmailFound: true });
           return res.json();
         } else {
+          this.setState({ buttonClicked: true });
           this.setState({ isEmailFound: false });
         }
       })