diff --git a/packages/ui/src/components/sign-in/steps/reset-password.tsx b/packages/ui/src/components/sign-in/steps/reset-password.tsx
index f30b652978a..5767e3221e9 100644
--- a/packages/ui/src/components/sign-in/steps/reset-password.tsx
+++ b/packages/ui/src/components/sign-in/steps/reset-password.tsx
@@ -66,32 +66,32 @@ export function SignInResetPassword() {
                   </div>
                 </Card.Body>
 
-                <Common.Loading>
-                  {isSubmitting => {
-                    return (
-                      <Card.Actions>
+                <Card.Actions>
+                  <Common.Loading scope='submit'>
+                    {isSubmitting => {
+                      return (
                         <SignIn.Action
                           submit
                           asChild
                         >
                           <Button
                             busy={isSubmitting}
-                            disabled={isGlobalLoading || isSubmitting}
+                            disabled={isGlobalLoading}
                           >
                             {t('signIn.resetPassword.formButtonPrimary')}
                           </Button>
                         </SignIn.Action>
+                      );
+                    }}
+                  </Common.Loading>
 
-                        <SignIn.Action
-                          navigate='start'
-                          asChild
-                        >
-                          <LinkButton>{t('backButton')}</LinkButton>
-                        </SignIn.Action>
-                      </Card.Actions>
-                    );
-                  }}
-                </Common.Loading>
+                  <SignIn.Action
+                    navigate='start'
+                    asChild
+                  >
+                    <LinkButton>{t('backButton')}</LinkButton>
+                  </SignIn.Action>
+                </Card.Actions>
               </Card.Content>
               <Card.Footer {...cardFooterProps} />
             </Card.Root>
diff --git a/packages/ui/src/components/sign-in/steps/start.tsx b/packages/ui/src/components/sign-in/steps/start.tsx
index 8ea52cf27cc..9808f609085 100644
--- a/packages/ui/src/components/sign-in/steps/start.tsx
+++ b/packages/ui/src/components/sign-in/steps/start.tsx
@@ -168,7 +168,7 @@ export function SignInStart() {
                             <SignIn.Passkey asChild>
                               <LinkButton
                                 type='button'
-                                disabled={isGlobalLoading || isSubmitting}
+                                disabled={isGlobalLoading}
                               >
                                 {t('signIn.start.actionLink__use_passkey')}
                               </LinkButton>
diff --git a/packages/ui/src/components/sign-in/steps/verifications.tsx b/packages/ui/src/components/sign-in/steps/verifications.tsx
index 5a8b0914400..97d05c0d645 100644
--- a/packages/ui/src/components/sign-in/steps/verifications.tsx
+++ b/packages/ui/src/components/sign-in/steps/verifications.tsx
@@ -92,10 +92,10 @@ export function SignInVerifications() {
                     />
                   </Card.Body>
 
-                  <Common.Loading>
-                    {isSubmitting => {
-                      return (
-                        <Card.Actions>
+                  <Card.Actions>
+                    <Common.Loading scope='submit'>
+                      {isSubmitting => {
+                        return (
                           <SignIn.Action
                             submit
                             asChild
@@ -108,19 +108,17 @@ export function SignInVerifications() {
                               {t('formButtonPrimary')}
                             </Button>
                           </SignIn.Action>
+                        );
+                      }}
+                    </Common.Loading>
 
-                          <SignIn.Action
-                            navigate='choose-strategy'
-                            asChild
-                          >
-                            <LinkButton disabled={isGlobalLoading || isSubmitting}>
-                              {t('signIn.password.actionLink')}
-                            </LinkButton>
-                          </SignIn.Action>
-                        </Card.Actions>
-                      );
-                    }}
-                  </Common.Loading>
+                    <SignIn.Action
+                      navigate='choose-strategy'
+                      asChild
+                    >
+                      <LinkButton disabled={isGlobalLoading}>{t('signIn.password.actionLink')}</LinkButton>
+                    </SignIn.Action>
+                  </Card.Actions>
                 </SignIn.Strategy>
 
                 <SignIn.Strategy name='passkey'>
@@ -155,22 +153,10 @@ export function SignInVerifications() {
 
                   <GlobalError />
 
-                  <Common.Loading>
-                    {isSubmitting => {
-                      return (
-                        <Card.Actions>
-                          {
-                            // Note:
-                            // 1. Currently this triggers the loading
-                            //    spinner for "Continue" which is a little
-                            //    confusing. We could use a manual setState
-                            //    on click, but we'll need to find a way to
-                            //    clean up the state based on `isSubmitting`
-                            // 2. This button doesn't currently work; it's
-                            //    being tracked here:
-                            //    https://linear.app/clerk/issue/SDKI-172
-                          }
-
+                  <Card.Actions>
+                    <Common.Loading scope='submit'>
+                      {isSubmitting => {
+                        return (
                           <SignIn.Action
                             submit
                             asChild
@@ -183,19 +169,16 @@ export function SignInVerifications() {
                               {t('formButtonPrimary')}
                             </Button>
                           </SignIn.Action>
-
-                          <SignIn.Action
-                            navigate='choose-strategy'
-                            asChild
-                          >
-                            <LinkButton disabled={isGlobalLoading || isSubmitting}>
-                              {t('footerActionLink__useAnotherMethod')}
-                            </LinkButton>
-                          </SignIn.Action>
-                        </Card.Actions>
-                      );
-                    }}
-                  </Common.Loading>
+                        );
+                      }}
+                    </Common.Loading>
+                    <SignIn.Action
+                      navigate='choose-strategy'
+                      asChild
+                    >
+                      <LinkButton disabled={isGlobalLoading}>{t('footerActionLink__useAnotherMethod')}</LinkButton>
+                    </SignIn.Action>
+                  </Card.Actions>
                 </SignIn.Strategy>
 
                 <SignIn.Strategy name='backup_code'>
@@ -217,10 +200,10 @@ export function SignInVerifications() {
                     <BackupCodeField />
                   </Card.Body>
 
-                  <Common.Loading>
-                    {isSubmitting => {
-                      return (
-                        <Card.Actions>
+                  <Card.Actions>
+                    <Common.Loading scope='submit'>
+                      {isSubmitting => {
+                        return (
                           <SignIn.Action
                             submit
                             asChild
@@ -233,22 +216,21 @@ export function SignInVerifications() {
                               {t('formButtonPrimary')}
                             </Button>
                           </SignIn.Action>
-
-                          <SignIn.Action
-                            navigate='choose-strategy'
-                            asChild
-                          >
-                            <LinkButton
-                              disabled={isGlobalLoading || isSubmitting}
-                              type='button'
-                            >
-                              {t('footerActionLink__useAnotherMethod')}
-                            </LinkButton>
-                          </SignIn.Action>
-                        </Card.Actions>
-                      );
-                    }}
-                  </Common.Loading>
+                        );
+                      }}
+                    </Common.Loading>
+                    <SignIn.Action
+                      navigate='choose-strategy'
+                      asChild
+                    >
+                      <LinkButton
+                        disabled={isGlobalLoading}
+                        type='button'
+                      >
+                        {t('footerActionLink__useAnotherMethod')}
+                      </LinkButton>
+                    </SignIn.Action>
+                  </Card.Actions>
                 </SignIn.Strategy>
 
                 <SignIn.Strategy name='email_code'>
@@ -307,10 +289,10 @@ export function SignInVerifications() {
                       }
                     />
                   </Card.Body>
-                  <Common.Loading scope='step:verifications'>
-                    {isSubmitting => {
-                      return (
-                        <Card.Actions>
+                  <Card.Actions>
+                    <Common.Loading scope='submit'>
+                      {isSubmitting => {
+                        return (
                           <SignIn.Action
                             submit
                             asChild
@@ -323,17 +305,17 @@ export function SignInVerifications() {
                               {t('formButtonPrimary')}
                             </Button>
                           </SignIn.Action>
+                        );
+                      }}
+                    </Common.Loading>
 
-                          <SignIn.Action
-                            asChild
-                            navigate='choose-strategy'
-                          >
-                            <LinkButton type='button'>{t('footerActionLink__useAnotherMethod')}</LinkButton>
-                          </SignIn.Action>
-                        </Card.Actions>
-                      );
-                    }}
-                  </Common.Loading>
+                    <SignIn.Action
+                      asChild
+                      navigate='choose-strategy'
+                    >
+                      <LinkButton type='button'>{t('footerActionLink__useAnotherMethod')}</LinkButton>
+                    </SignIn.Action>
+                  </Card.Actions>
                 </SignIn.Strategy>
 
                 <SignIn.Strategy name='phone_code'>
@@ -393,10 +375,10 @@ export function SignInVerifications() {
                     />
                   </Card.Body>
 
-                  <Common.Loading scope='step:verifications'>
-                    {isSubmitting => {
-                      return (
-                        <Card.Actions>
+                  <Card.Actions>
+                    <Common.Loading scope='submit'>
+                      {isSubmitting => {
+                        return (
                           <SignIn.Action
                             submit
                             asChild
@@ -409,17 +391,17 @@ export function SignInVerifications() {
                               {t('formButtonPrimary')}
                             </Button>
                           </SignIn.Action>
+                        );
+                      }}
+                    </Common.Loading>
 
-                          <SignIn.Action
-                            asChild
-                            navigate='choose-strategy'
-                          >
-                            <LinkButton type='button'>{t('footerActionLink__useAnotherMethod')}</LinkButton>
-                          </SignIn.Action>
-                        </Card.Actions>
-                      );
-                    }}
-                  </Common.Loading>
+                    <SignIn.Action
+                      asChild
+                      navigate='choose-strategy'
+                    >
+                      <LinkButton type='button'>{t('footerActionLink__useAnotherMethod')}</LinkButton>
+                    </SignIn.Action>
+                  </Card.Actions>
                 </SignIn.Strategy>
 
                 <SignIn.Strategy name='email_link'>
@@ -517,10 +499,10 @@ export function SignInVerifications() {
                     />
                   </Card.Body>
 
-                  <Common.Loading scope='step:verifications'>
-                    {isSubmitting => {
-                      return (
-                        <Card.Actions>
+                  <Card.Actions>
+                    <Common.Loading scope='submit'>
+                      {isSubmitting => {
+                        return (
                           <SignIn.Action
                             submit
                             asChild
@@ -533,10 +515,10 @@ export function SignInVerifications() {
                               {t('formButtonPrimary')}
                             </Button>
                           </SignIn.Action>
-                        </Card.Actions>
-                      );
-                    }}
-                  </Common.Loading>
+                        );
+                      }}
+                    </Common.Loading>
+                  </Card.Actions>
                 </SignIn.Strategy>
 
                 <SignIn.Strategy name='totp'>
@@ -561,10 +543,10 @@ export function SignInVerifications() {
                     />
                   </Card.Body>
 
-                  <Common.Loading scope='step:verifications'>
-                    {isSubmitting => {
-                      return (
-                        <Card.Actions>
+                  <Card.Actions>
+                    <Common.Loading scope='submit'>
+                      {isSubmitting => {
+                        return (
                           <SignIn.Action
                             submit
                             asChild
@@ -577,17 +559,16 @@ export function SignInVerifications() {
                               {t('formButtonPrimary')}
                             </Button>
                           </SignIn.Action>
-
-                          <SignIn.Action
-                            asChild
-                            navigate='choose-strategy'
-                          >
-                            <LinkButton type='button'>{t('footerActionLink__useAnotherMethod')}</LinkButton>
-                          </SignIn.Action>
-                        </Card.Actions>
-                      );
-                    }}
-                  </Common.Loading>
+                        );
+                      }}
+                    </Common.Loading>
+                    <SignIn.Action
+                      asChild
+                      navigate='choose-strategy'
+                    >
+                      <LinkButton type='button'>{t('footerActionLink__useAnotherMethod')}</LinkButton>
+                    </SignIn.Action>
+                  </Card.Actions>
                 </SignIn.Strategy>
               </Card.Content>
               <Card.Footer {...cardFooterProps} />
diff --git a/packages/ui/src/components/sign-up/steps/continue.tsx b/packages/ui/src/components/sign-up/steps/continue.tsx
index 69cbb2e3f4e..37c02d3848a 100644
--- a/packages/ui/src/components/sign-up/steps/continue.tsx
+++ b/packages/ui/src/components/sign-up/steps/continue.tsx
@@ -97,10 +97,10 @@ export function SignUpContinue() {
                     ) : null}
                   </div>
                 </Card.Body>
-                <Common.Loading scope='step:continue'>
-                  {isSubmitting => {
-                    return (
-                      <Card.Actions>
+                <Card.Actions>
+                  <Common.Loading scope='submit'>
+                    {isSubmitting => {
+                      return (
                         <SignUp.Action
                           submit
                           asChild
@@ -113,10 +113,10 @@ export function SignUpContinue() {
                             {t('formButtonPrimary')}
                           </Button>
                         </SignUp.Action>
-                      </Card.Actions>
-                    );
-                  }}
-                </Common.Loading>
+                      );
+                    }}
+                  </Common.Loading>
+                </Card.Actions>
               </Card.Content>
               <Card.Footer {...cardFooterProps}>
                 <Card.FooterAction>
diff --git a/packages/ui/src/components/sign-up/steps/start.tsx b/packages/ui/src/components/sign-up/steps/start.tsx
index 466b01f4334..2a37c627bb3 100644
--- a/packages/ui/src/components/sign-up/steps/start.tsx
+++ b/packages/ui/src/components/sign-up/steps/start.tsx
@@ -133,10 +133,10 @@ export function SignUpStart() {
                   {userSettings.signUp.captcha_enabled ? <SignUp.Captcha className='empty:hidden' /> : null}
                 </Card.Body>
                 {hasConnection || hasIdentifier ? (
-                  <Common.Loading scope='step:start'>
-                    {isSubmitting => {
-                      return (
-                        <Card.Actions>
+                  <Card.Actions>
+                    <Common.Loading scope='submit'>
+                      {isSubmitting => {
+                        return (
                           <SignUp.Action
                             submit
                             asChild
@@ -149,10 +149,10 @@ export function SignUpStart() {
                               {t('formButtonPrimary')}
                             </Button>
                           </SignUp.Action>
-                        </Card.Actions>
-                      );
-                    }}
-                  </Common.Loading>
+                        );
+                      }}
+                    </Common.Loading>
+                  </Card.Actions>
                 ) : null}
               </Card.Content>
               <Card.Footer {...cardFooterProps}>
diff --git a/packages/ui/src/components/sign-up/steps/verifications.tsx b/packages/ui/src/components/sign-up/steps/verifications.tsx
index 771ac5b0591..4233155075e 100644
--- a/packages/ui/src/components/sign-up/steps/verifications.tsx
+++ b/packages/ui/src/components/sign-up/steps/verifications.tsx
@@ -120,10 +120,10 @@ export function SignUpVerifications() {
                       }
                     />
                   </Card.Body>
-                  <Common.Loading scope='step:verifications'>
-                    {isSubmitting => {
-                      return (
-                        <Card.Actions>
+                  <Card.Actions>
+                    <Common.Loading scope='submit'>
+                      {isSubmitting => {
+                        return (
                           <SignUp.Action
                             submit
                             asChild
@@ -136,10 +136,10 @@ export function SignUpVerifications() {
                               {t('formButtonPrimary')}
                             </Button>
                           </SignUp.Action>
-                        </Card.Actions>
-                      );
-                    }}
-                  </Common.Loading>
+                        );
+                      }}
+                    </Common.Loading>
+                  </Card.Actions>
                 </SignUp.Strategy>
 
                 <SignUp.Strategy name='email_code'>
@@ -198,10 +198,10 @@ export function SignUpVerifications() {
                       }
                     />
                   </Card.Body>
-                  <Common.Loading scope='step:verifications'>
-                    {isSubmitting => {
-                      return (
-                        <Card.Actions>
+                  <Card.Actions>
+                    <Common.Loading scope='submit'>
+                      {isSubmitting => {
+                        return (
                           <SignUp.Action
                             submit
                             asChild
@@ -214,10 +214,10 @@ export function SignUpVerifications() {
                               {t('formButtonPrimary')}
                             </Button>
                           </SignUp.Action>
-                        </Card.Actions>
-                      );
-                    }}
-                  </Common.Loading>
+                        );
+                      }}
+                    </Common.Loading>
+                  </Card.Actions>
                 </SignUp.Strategy>
 
                 <SignUp.Strategy name='email_link'>