diff --git a/website/src/pages/auth/signup.tsx b/website/src/pages/auth/signup.tsx
index b214ec38..8e918f51 100644
--- a/website/src/pages/auth/signup.tsx
+++ b/website/src/pages/auth/signup.tsx
@@ -10,18 +10,17 @@ import { AuthLayout } from "src/components/AuthLayout";
 export default function Signin({ csrfToken, providers }) {
   const { discord, email, github, credentials } = providers;
   const emailEl = useRef(null);
-  const signinWithEmail = () => {
+  const debugUsernameEl = useRef(null);
+
+  const signinWithEmail = (ev : React.FormEvent) => {
+    ev.preventDefault()
     signIn(email.id, { callbackUrl: "/", email: emailEl.current.value });
   };
 
-  const debugUsernameEl = useRef(null);
   function signinWithDebugCredentials(ev: React.FormEvent) {
     ev.preventDefault();
     signIn(credentials.id, { callbackUrl: "/", username: debugUsernameEl.current.value });
   }
-  const handleOnClickPressed = (e) => {
-    if (e.key === "Enter") signinWithEmail();
-  };
 
   return (
     <>
@@ -43,24 +42,23 @@ export default function Signin({ csrfToken, providers }) {
             </form>
           )}
           {email && (
-            <Stack>
-              <Input
-                onKeyDown={handleOnClickPressed}
-                variant="outline"
-                size="lg"
-                placeholder="Email Address"
-                ref={emailEl}
-              />
-              <Button
-                size={"lg"}
-                leftIcon={<FaEnvelope />}
-                colorScheme="gray"
-                onClick={signinWithEmail}
-                // isDisabled="false"
-              >
-                Continue with Email
-              </Button>
-            </Stack>
+            <form onSubmit={signinWithEmail} >
+              <Stack>
+                <Input
+                  variant="outline"
+                  size="lg"
+                  placeholder="Email Address"
+                  ref={emailEl}
+                />
+                <Button
+                  size={"lg"}
+                  leftIcon={<FaEnvelope />}
+                  colorScheme="gray"
+                >
+                  Continue with Email
+                </Button>
+              </Stack>
+            </form>
           )}
           {discord && (
             <Button