diff --git a/packages/twenty-front/src/modules/auth/hooks/useAuth.ts b/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
index adec1b56b..15b293652 100644
--- a/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
@@ -464,7 +464,7 @@ export const useAuth = () => {
 
   const handleCredentialsSignUp = useCallback(
     async (email: string, password: string, captchaToken?: string) => {
-      signUp({
+      return signUp({
         variables: { email, password, captchaToken },
         onCompleted: async (data) => {
           handleSetAuthTokens(data.signUp.tokens);
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx
index 71debd21c..23219938e 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx
@@ -260,7 +260,9 @@ export const SignInUpGlobalScopeForm = () => {
                 />
               )}
               <MainButton
-                disabled={isRequestingCaptchaToken}
+                disabled={
+                  isRequestingCaptchaToken || form.formState.isSubmitting
+                }
                 title={
                   signInUpStep === SignInUpStep.Password
                     ? signInUpMode === SignInUpMode.SignIn