diff --git a/backend/src/services/auth/auth-login-service.ts b/backend/src/services/auth/auth-login-service.ts
index 065e304d4..77b39c671 100644
--- a/backend/src/services/auth/auth-login-service.ts
+++ b/backend/src/services/auth/auth-login-service.ts
@@ -236,7 +236,7 @@ export const authLoginServiceFactory = ({
 
     if (!isValidClientProof) {
       await userDAL.update(
-        { id: userEnc.id },
+        { id: userEnc.userId },
         {
           $incr: {
             consecutiveFailedPasswordAttempts: 1
@@ -251,6 +251,11 @@ export const authLoginServiceFactory = ({
       serverPrivateKey: null,
       clientPublicKey: null
     });
+
+    await userDAL.updateById(userEnc.userId, {
+      consecutiveFailedPasswordAttempts: 0
+    });
+
     // send multi factor auth token if they it enabled
     if (userEnc.isMfaEnabled && userEnc.email) {
       enforceUserLockStatus(Boolean(user.isLocked), user.temporaryLockDateEnd);
diff --git a/frontend/src/views/Login/components/InitialStep/InitialStep.tsx b/frontend/src/views/Login/components/InitialStep/InitialStep.tsx
index 0ae253d03..48f7af758 100644
--- a/frontend/src/views/Login/components/InitialStep/InitialStep.tsx
+++ b/frontend/src/views/Login/components/InitialStep/InitialStep.tsx
@@ -141,6 +141,7 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
       captchaRef.current.resetCaptcha();
     }
 
+    setCaptchaToken("");
     setIsLoading(false);
   };
 
@@ -274,6 +275,7 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
       )}
       <div className="mt-3 w-1/4 min-w-[21.2rem] rounded-md text-center md:min-w-[20.1rem] lg:w-1/6">
         <Button
+          disabled={shouldShowCaptcha && captchaToken === ""}
           type="submit"
           size="sm"
           isFullWidth
diff --git a/frontend/src/views/Login/components/PasswordStep/PasswordStep.tsx b/frontend/src/views/Login/components/PasswordStep/PasswordStep.tsx
index e3dc78ab2..2ba90528f 100644
--- a/frontend/src/views/Login/components/PasswordStep/PasswordStep.tsx
+++ b/frontend/src/views/Login/components/PasswordStep/PasswordStep.tsx
@@ -180,6 +180,7 @@ export const PasswordStep = ({
     if (captchaRef.current) {
       captchaRef.current.resetCaptcha();
     }
+    setCaptchaToken("");
   };
 
   return (
@@ -223,6 +224,7 @@ export const PasswordStep = ({
       )}
       <div className="mx-auto mt-4 flex w-1/4 w-full min-w-[22rem] items-center justify-center rounded-md text-center lg:w-1/6">
         <Button
+          disabled={shouldShowCaptcha && captchaToken === ""}
           type="submit"
           colorSchema="primary"
           variant="outline_bg"