diff --git a/package.json b/package.json
index 2ceeca43d..b320a459a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next-supabase-saas-kit-turbo",
-  "version": "2.21.6",
+  "version": "2.21.7",
   "private": true,
   "sideEffects": false,
   "engines": {
diff --git a/packages/features/auth/src/components/password-reset-request-container.tsx b/packages/features/auth/src/components/password-reset-request-container.tsx
index b90f878d9..6569b8823 100644
--- a/packages/features/auth/src/components/password-reset-request-container.tsx
+++ b/packages/features/auth/src/components/password-reset-request-container.tsx
@@ -107,9 +107,18 @@ export function PasswordResetRequestContainer(params: {
                 type="submit"
               >
                 <If
-                  condition={captchaLoading}
-                  fallback={<Trans i18nKey={'auth:passwordResetLabel'} />}
+                  condition={
+                    !resetPasswordMutation.isPending && !captchaLoading
+                  }
                 >
+                  <Trans i18nKey={'auth:passwordResetLabel'} />
+                </If>
+
+                <If condition={resetPasswordMutation.isPending}>
+                  <Trans i18nKey={'auth:passwordResetLabel'} />
+                </If>
+
+                <If condition={captchaLoading}>
                   <Trans i18nKey={'auth:verifyingCaptcha'} />
                 </If>
               </Button>
diff --git a/packages/features/auth/src/components/password-sign-in-form.tsx b/packages/features/auth/src/components/password-sign-in-form.tsx
index 15506bc89..bfc0d46aa 100644
--- a/packages/features/auth/src/components/password-sign-in-form.tsx
+++ b/packages/features/auth/src/components/password-sign-in-form.tsx
@@ -134,7 +134,7 @@ export function PasswordSignInForm({
             </span>
           </If>
 
-          <If condition={!redirecting && !loading}>
+          <If condition={!redirecting && !loading && !captchaLoading}>
             <span className={'animate-out fade-out flex items-center'}>
               <Trans i18nKey={'auth:signInWithEmail'} />
 
diff --git a/packages/features/auth/src/components/resend-auth-link-form.tsx b/packages/features/auth/src/components/resend-auth-link-form.tsx
index c45b3153a..c7fa19d56 100644
--- a/packages/features/auth/src/components/resend-auth-link-form.tsx
+++ b/packages/features/auth/src/components/resend-auth-link-form.tsx
@@ -94,7 +94,9 @@ export function ResendAuthLinkForm(props: {
             <Trans i18nKey={'auth:resendingLink'} />
           </If>
 
-          <Trans i18nKey={'auth:resendLink'} defaults={'Resend Link'} />
+          <If condition={!resendLink.isPending && !captchaLoading}>
+            <Trans i18nKey={'auth:resendLink'} defaults={'Resend Link'} />
+          </If>
         </Button>
       </form>