diff --git a/app/_components/change-password-form.tsx b/app/_components/change-password-form.tsx
index 69975765..570e9197 100644
--- a/app/_components/change-password-form.tsx
+++ b/app/_components/change-password-form.tsx
@@ -17,6 +17,7 @@ const ChangePasswordForm = () => {
         required
         type="password"
       />
+      {state?.error && <p className="text-center">{state.error}</p>}
       <Button
         className="mt-8 w-full"
         loadingText="Changing password…"
@@ -24,7 +25,6 @@ const ChangePasswordForm = () => {
       >
         Change password
       </Button>
-      {state?.error && <p className="text-center">{state.error}</p>}
     </form>
   );
 };
diff --git a/app/_components/forgot-password-form.tsx b/app/_components/forgot-password-form.tsx
index 35d63289..5beb819e 100644
--- a/app/_components/forgot-password-form.tsx
+++ b/app/_components/forgot-password-form.tsx
@@ -11,10 +11,10 @@ const ForgotPasswordForm = () => {
   return (
     <form action={action} className="flex flex-col gap-6">
       <Input label="Email address" name="email" required type="email" />
+      {state?.error && <p className="text-center">{state.error}</p>}
       <Button className="mt-8 w-full" loadingText="Sending link…" type="submit">
         Send reset link
       </Button>
-      {state?.error && <p className="text-center">{state.error}</p>}
     </form>
   );
 };
diff --git a/app/_components/sign-in-form.tsx b/app/_components/sign-in-form.tsx
index 80e19a57..0b3cbb56 100644
--- a/app/_components/sign-in-form.tsx
+++ b/app/_components/sign-in-form.tsx
@@ -31,10 +31,10 @@ const SignInForm = ({ next }: SignInFormProps) => {
           Forgot password?
         </Button>
       </div>
+      {state?.error && <p className="text-center">{state.error}</p>}
       <Button className="mt-8 w-full" loadingText="Signing in…" type="submit">
         Sign in
       </Button>
-      {state?.error && <p className="text-center">{state.error}</p>}
     </form>
   );
 };
diff --git a/app/_components/sign-up-form.tsx b/app/_components/sign-up-form.tsx
index b1814b6c..a7adb9eb 100644
--- a/app/_components/sign-up-form.tsx
+++ b/app/_components/sign-up-form.tsx
@@ -26,6 +26,7 @@ const SignUpForm = ({ next }: SignUpFormProps) => {
         required
         type="password"
       />
+      {state?.error && <p className="text-center">{state.error}</p>}
       <Button
         className="mt-8 w-full"
         loadingText="Creating account…"
@@ -33,7 +34,6 @@ const SignUpForm = ({ next }: SignUpFormProps) => {
       >
         Create account
       </Button>
-      {state?.error && <p className="text-center">{state.error}</p>}
     </form>
   );
 };