diff --git a/src/components/AuthenticationFlow/AuthenticationForm.tsx b/src/components/AuthenticationFlow/AuthenticationForm.tsx
index 3a6b5ecb6..70f07c5f4 100644
--- a/src/components/AuthenticationFlow/AuthenticationForm.tsx
+++ b/src/components/AuthenticationFlow/AuthenticationForm.tsx
@@ -3,8 +3,15 @@ import { GitHubButton } from './GitHubButton';
 import { GoogleButton } from './GoogleButton';
 import { LinkedInButton } from './LinkedInButton';
 import { EmailLoginForm } from './EmailLoginForm';
+import { EmailSignupForm } from './EmailSignupForm';
+
+type AuthenticationFormProps = {
+  type?: 'login' | 'signup';
+};
+
+export function AuthenticationForm(props: AuthenticationFormProps) {
+  const { type = 'login' } = props;
 
-export function AuthenticationForm() {
   const [isDisabled, setIsDisabled] = useState(false);
 
   return (
@@ -21,7 +28,14 @@ export function AuthenticationForm() {
         <div className="h-px w-full bg-slate-200" />
       </div>
 
-      <EmailLoginForm isDisabled={isDisabled} setIsDisabled={setIsDisabled} />
+      {type === 'login' ? (
+        <EmailLoginForm isDisabled={isDisabled} setIsDisabled={setIsDisabled} />
+      ) : (
+        <EmailSignupForm
+          isDisabled={isDisabled}
+          setIsDisabled={setIsDisabled}
+        />
+      )}
     </>
   );
 }
diff --git a/src/pages/signup.astro b/src/pages/signup.astro
index fb14c97d0..a44915c17 100644
--- a/src/pages/signup.astro
+++ b/src/pages/signup.astro
@@ -25,7 +25,7 @@ import AccountLayout from '../layouts/AccountLayout.astro';
         </p>
       </div>
 
-      <AuthenticationForm client:load />
+      <AuthenticationForm type='signup' client:load />
 
       <div class='mt-6 text-center text-sm text-slate-600'>
         Already have an account? <a