diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpForm.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpForm.tsx
index c45efb445..85d04ba20 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpForm.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpForm.tsx
@@ -5,6 +5,7 @@ import styled from '@emotion/styled';
 import { motion } from 'framer-motion';
 
 import { IconGoogle } from '@/ui/display/icon/components/IconGoogle';
+import { Loader } from '@/ui/feedback/loader/components/Loader';
 import { MainButton } from '@/ui/input/button/components/MainButton';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { AnimatedEaseIn } from '@/ui/utilities/animation/components/AnimatedEaseIn';
@@ -85,8 +86,12 @@ export const SignInUpForm = () => {
       return 'Continue';
     }
 
-    return signInUpMode === SignInUpMode.SignIn ? 'Sign in' : 'Sign up';
-  }, [signInUpMode, signInUpStep]);
+    return signInUpMode === SignInUpMode.SignIn
+      ? 'Sign in'
+      : isSubmitting
+        ? 'Creating workspace'
+        : 'Sign up';
+  }, [signInUpMode, signInUpStep, isSubmitting]);
 
   const title = useMemo(() => {
     if (signInUpMode === SignInUpMode.Invite) {
@@ -215,6 +220,7 @@ export const SignInUpForm = () => {
               setShowErrors(true);
               handleSubmit(submitCredentials)();
             }}
+            Icon={() => isSubmitting && <Loader />}
             disabled={
               SignInUpStep.Init
                 ? false