diff --git a/apps/web/src/components/forms/forgot-password.tsx b/apps/web/src/components/forms/forgot-password.tsx
index 449d346e4..141f3780f 100644
--- a/apps/web/src/components/forms/forgot-password.tsx
+++ b/apps/web/src/components/forms/forgot-password.tsx
@@ -73,7 +73,7 @@ export const ForgotPasswordForm = ({ className }: ForgotPasswordFormProps) => {
       </div>
 
       <Button size="lg" loading={isSubmitting}>
-        Reset Password
+        {isSubmitting ? 'Sending Reset Email...' : 'Reset Password'}
       </Button>
     </form>
   );
diff --git a/apps/web/src/components/forms/reset-password.tsx b/apps/web/src/components/forms/reset-password.tsx
index f97f703b2..47f423d76 100644
--- a/apps/web/src/components/forms/reset-password.tsx
+++ b/apps/web/src/components/forms/reset-password.tsx
@@ -166,7 +166,7 @@ export const ResetPasswordForm = ({ className, token }: ResetPasswordFormProps)
       </div>
 
       <Button size="lg" loading={isSubmitting}>
-        Reset Password
+        {isSubmitting ? 'Resetting Password...' : 'Reset Password'}
       </Button>
     </form>
   );
diff --git a/apps/web/src/components/forms/signin.tsx b/apps/web/src/components/forms/signin.tsx
index 583d19de8..a69dc9493 100644
--- a/apps/web/src/components/forms/signin.tsx
+++ b/apps/web/src/components/forms/signin.tsx
@@ -146,9 +146,13 @@ export const SignInForm = ({ className }: SignInFormProps) => {
         <FormErrorMessage className="mt-1.5" error={errors.password} />
       </div>
 
-      <Button size="lg" disabled={isSubmitting} className="dark:bg-documenso dark:hover:opacity-90">
-        {isSubmitting && <Loader className="mr-2 h-5 w-5 animate-spin" />}
-        Sign In
+      <Button
+        size="lg"
+        loading={isSubmitting}
+        disabled={isSubmitting}
+        className="dark:bg-documenso dark:hover:opacity-90"
+      >
+        {isSubmitting ? 'Signing in...' : 'Sign in'}
       </Button>
 
       <div className="relative flex items-center justify-center gap-x-4 py-2 text-xs uppercase">
diff --git a/apps/web/src/components/forms/signup.tsx b/apps/web/src/components/forms/signup.tsx
index a3c3bd92f..fb6b92394 100644
--- a/apps/web/src/components/forms/signup.tsx
+++ b/apps/web/src/components/forms/signup.tsx
@@ -157,9 +157,13 @@ export const SignUpForm = ({ className }: SignUpFormProps) => {
         <FormErrorMessage className="mt-1.5" error={errors.signature} />
       </div>
 
-      <Button size="lg" disabled={isSubmitting} className="dark:bg-documenso dark:hover:opacity-90">
-        {isSubmitting && <Loader className="mr-2 h-5 w-5 animate-spin" />}
-        Sign Up
+      <Button
+        size="lg"
+        loading={isSubmitting}
+        disabled={isSubmitting}
+        className="dark:bg-documenso dark:hover:opacity-90"
+      >
+        {isSubmitting ? 'Signing up...' : 'Sign up'}
       </Button>
     </form>
   );