diff --git a/src/components/settings/SignerAccountMFA/PasswordForm.tsx b/src/components/settings/SignerAccountMFA/PasswordForm.tsx
index 87177f55e6..b681bbc437 100644
--- a/src/components/settings/SignerAccountMFA/PasswordForm.tsx
+++ b/src/components/settings/SignerAccountMFA/PasswordForm.tsx
@@ -103,7 +103,6 @@ export const PasswordForm = () => {
     if (!mpcCoreKit) return
 
     await enableMFA(dispatch, mpcCoreKit, data)
-    onReset()
   }
 
   const onReset = () => {
diff --git a/src/components/settings/SignerAccountMFA/helper.ts b/src/components/settings/SignerAccountMFA/helper.ts
index c5b93bb03a..21dc6f9cb5 100644
--- a/src/components/settings/SignerAccountMFA/helper.ts
+++ b/src/components/settings/SignerAccountMFA/helper.ts
@@ -58,6 +58,7 @@ export const enableMFA = async (
     const error = asError(e)
     logError(ErrorCodes._304, error.message)
 
+    // TODO: Check if we should use a notification or show an error inside the form
     dispatch(
       showNotification({
         variant: 'error',