diff --git a/components/AuthSubmitButton.tsx b/components/AuthSubmitButton.tsx
deleted file mode 100644
index 434d0af..0000000
--- a/components/AuthSubmitButton.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { IconProp } from "@fortawesome/fontawesome-svg-core";
-
-type Props = {
-  onClick?: Function;
-  icon?: IconProp;
-  label: string;
-  loading: boolean;
-  className?: string;
-};
-
-export default function AuthSubmitButton({
-  onClick,
-  icon,
-  label,
-  loading,
-  className,
-}: Props) {
-  return (
-    <button
-      type="submit"
-      className={`text-white flex items-center gap-2 py-2 px-5 rounded-md text-lg tracking-wide select-none font-semibold duration-100 w-fit ${
-        loading
-          ? "bg-sky-600 cursor-auto"
-          : "bg-sky-700 hover:bg-sky-600 cursor-pointer"
-      } ${className}`}
-      onClick={() => {
-        if (!loading && onClick) onClick();
-      }}
-    >
-      {icon && <FontAwesomeIcon icon={icon} className="h-5" />}
-      <p className="text-center w-full">{label}</p>
-    </button>
-  );
-}
diff --git a/components/SubmitButton.tsx b/components/SubmitButton.tsx
index 8a06eac..6ee0a78 100644
--- a/components/SubmitButton.tsx
+++ b/components/SubmitButton.tsx
@@ -2,11 +2,12 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { IconProp } from "@fortawesome/fontawesome-svg-core";
 
 type Props = {
-  onClick: Function;
+  onClick?: Function;
   icon?: IconProp;
   label: string;
   loading: boolean;
   className?: string;
+  type?: "button" | "submit" | "reset" | undefined;
 };
 
 export default function SubmitButton({
@@ -15,20 +16,22 @@ export default function SubmitButton({
   label,
   loading,
   className,
+  type,
 }: Props) {
   return (
-    <div
+    <button
+      type={type ? type : undefined}
       className={`text-white flex items-center gap-2 py-2 px-5 rounded-md text-lg tracking-wide select-none font-semibold duration-100 w-fit ${
         loading
           ? "bg-sky-600 cursor-auto"
           : "bg-sky-700 hover:bg-sky-600 cursor-pointer"
       } ${className}`}
       onClick={() => {
-        if (!loading) onClick();
+        if (!loading && onClick) onClick();
       }}
     >
-      {icon && <FontAwesomeIcon icon={icon} className="h-5 select-none" />}
-      <p className="text-center w-full select-none">{label}</p>
-    </div>
+      {icon && <FontAwesomeIcon icon={icon} className="h-5" />}
+      <p className="text-center w-full">{label}</p>
+    </button>
   );
 }
diff --git a/pages/choose-username.tsx b/pages/choose-username.tsx
index 75d6aa0..1b4d9be 100644
--- a/pages/choose-username.tsx
+++ b/pages/choose-username.tsx
@@ -1,6 +1,6 @@
 import SubmitButton from "@/components/SubmitButton";
 import { signOut } from "next-auth/react";
-import { useState } from "react";
+import { FormEvent, useState } from "react";
 import { toast } from "react-hot-toast";
 import { useSession } from "next-auth/react";
 import useAccountStore from "@/store/account";
@@ -15,7 +15,9 @@ export default function ChooseUsername() {
 
   const { updateAccount, account } = useAccountStore();
 
-  async function submitUsername() {
+  async function submitUsername(event: FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+
     setSubmitLoader(true);
 
     const redirectionToast = toast.loading("Applying...");
@@ -38,50 +40,53 @@ export default function ChooseUsername() {
 
   return (
     <CenteredForm>
-      <div className="p-4 mx-auto flex flex-col gap-3 justify-between sm:w-[30rem] w-80 bg-slate-50 dark:border-neutral-700 dark:bg-neutral-800 rounded-2xl shadow-md border border-sky-100">
-        <p className="text-2xl text-center text-black dark:text-white font-bold">
-          Choose a Username (Last step)
-        </p>
-
-        <div>
-          <p className="text-sm text-black dark:text-white w-fit font-semibold mb-1">
-            Username
+      <form onSubmit={submitUsername}>
+        <div className="p-4 mx-auto flex flex-col gap-3 justify-between sm:w-[30rem] w-80 bg-slate-50 dark:border-neutral-700 dark:bg-neutral-800 rounded-2xl shadow-md border border-sky-100">
+          <p className="text-2xl text-center text-black dark:text-white font-bold">
+            Choose a Username (Last step)
           </p>
 
-          <TextInput
-            placeholder="john"
-            value={inputedUsername}
-            className="bg-white"
-            onChange={(e) => setInputedUsername(e.target.value)}
+          <div>
+            <p className="text-sm text-black dark:text-white w-fit font-semibold mb-1">
+              Username
+            </p>
+
+            <TextInput
+              autoFocus
+              placeholder="john"
+              value={inputedUsername}
+              className="bg-white"
+              onChange={(e) => setInputedUsername(e.target.value)}
+            />
+          </div>
+          <div>
+            <p className="text-md text-gray-500 dark:text-gray-400 mt-1">
+              Feel free to reach out to us at{" "}
+              <a
+                className="font-semibold underline"
+                href="mailto:support@linkwarden.app"
+              >
+                support@linkwarden.app
+              </a>{" "}
+              in case of any issues.
+            </p>
+          </div>
+
+          <SubmitButton
+            type="submit"
+            label="Complete Registration"
+            className="mt-2 w-full text-center"
+            loading={submitLoader}
           />
-        </div>
-        <div>
-          <p className="text-md text-gray-500 dark:text-gray-400 mt-1">
-            Feel free to reach out to us at{" "}
-            <a
-              className="font-semibold underline"
-              href="mailto:support@linkwarden.app"
-            >
-              support@linkwarden.app
-            </a>{" "}
-            in case of any issues.
-          </p>
-        </div>
 
-        <SubmitButton
-          onClick={submitUsername}
-          label="Complete Registration"
-          className="mt-2 w-full text-center"
-          loading={submitLoader}
-        />
-
-        <div
-          onClick={() => signOut()}
-          className="w-fit mx-auto cursor-pointer text-gray-500 dark:text-gray-400 font-semibold "
-        >
-          Sign Out
+          <div
+            onClick={() => signOut()}
+            className="w-fit mx-auto cursor-pointer text-gray-500 dark:text-gray-400 font-semibold "
+          >
+            Sign Out
+          </div>
         </div>
-      </div>
+      </form>
     </CenteredForm>
   );
 }
diff --git a/pages/forgot.tsx b/pages/forgot.tsx
index eb60eb7..d2fc8c7 100644
--- a/pages/forgot.tsx
+++ b/pages/forgot.tsx
@@ -3,7 +3,7 @@ import TextInput from "@/components/TextInput";
 import CenteredForm from "@/layouts/CenteredForm";
 import { signIn } from "next-auth/react";
 import Link from "next/link";
-import { useState } from "react";
+import { FormEvent, useState } from "react";
 import { toast } from "react-hot-toast";
 
 interface FormData {
@@ -17,7 +17,9 @@ export default function Forgot() {
     email: "",
   });
 
-  async function loginUser() {
+  async function sendConfirmation(event: FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+
     if (form.email !== "") {
       setSubmitLoader(true);
 
@@ -40,49 +42,52 @@ export default function Forgot() {
 
   return (
     <CenteredForm>
-      <div className="p-4 flex flex-col gap-3 justify-between sm:w-[30rem] w-80 bg-slate-50 dark:border-neutral-700 dark:bg-neutral-800 rounded-2xl shadow-md border border-sky-100">
-        <p className="text-2xl text-center text-black dark:text-white font-bold">
-          Password Recovery
-        </p>
-        <div>
-          <p className="text-md text-black dark:text-white">
-            Enter your Email so we can send you a link to recover your account.
-            Make sure to change your password in the profile settings
-            afterwards.
-          </p>
-          <p className="text-sm text-gray-500 dark:text-gray-400">
-            You wont get logged in if you haven&apos;t created an account yet.
-          </p>
-        </div>
-        <div>
-          <p className="text-sm text-black dark:text-white w-fit font-semibold mb-1">
-            Email
+      <form onSubmit={sendConfirmation}>
+        <div className="p-4 flex flex-col gap-3 justify-between sm:w-[30rem] w-80 bg-slate-50 dark:border-neutral-700 dark:bg-neutral-800 rounded-2xl shadow-md border border-sky-100">
+          <p className="text-2xl text-center text-black dark:text-white font-bold">
+            Password Recovery
           </p>
+          <div>
+            <p className="text-md text-black dark:text-white">
+              Enter your Email so we can send you a link to recover your
+              account. Make sure to change your password in the profile settings
+              afterwards.
+            </p>
+            <p className="text-sm text-gray-500 dark:text-gray-400">
+              You wont get logged in if you haven&apos;t created an account yet.
+            </p>
+          </div>
+          <div>
+            <p className="text-sm text-black dark:text-white w-fit font-semibold mb-1">
+              Email
+            </p>
 
-          <TextInput
-            type="email"
-            placeholder="johnny@example.com"
-            value={form.email}
-            className="bg-white"
-            onChange={(e) => setForm({ ...form, email: e.target.value })}
+            <TextInput
+              autoFocus
+              type="email"
+              placeholder="johnny@example.com"
+              value={form.email}
+              className="bg-white"
+              onChange={(e) => setForm({ ...form, email: e.target.value })}
+            />
+          </div>
+
+          <SubmitButton
+            type="submit"
+            label="Send Login Link"
+            className="mt-2 w-full text-center"
+            loading={submitLoader}
           />
+          <div className="flex items-baseline gap-1 justify-center">
+            <Link
+              href={"/login"}
+              className="block text-black dark:text-white font-bold"
+            >
+              Go back
+            </Link>
+          </div>
         </div>
-
-        <SubmitButton
-          onClick={loginUser}
-          label="Send Login Link"
-          className="mt-2 w-full text-center"
-          loading={submitLoader}
-        />
-        <div className="flex items-baseline gap-1 justify-center">
-          <Link
-            href={"/login"}
-            className="block text-black dark:text-white font-bold"
-          >
-            Go back
-          </Link>
-        </div>
-      </div>
+      </form>
     </CenteredForm>
   );
 }
diff --git a/pages/login.tsx b/pages/login.tsx
index 3c39284..6c9c402 100644
--- a/pages/login.tsx
+++ b/pages/login.tsx
@@ -5,7 +5,6 @@ import { signIn } from "next-auth/react";
 import Link from "next/link";
 import { useState, FormEvent } from "react";
 import { toast } from "react-hot-toast";
-import AuthSubmitButton from "@/components/AuthSubmitButton";
 
 interface FormData {
   username: string;
@@ -95,14 +94,18 @@ export default function Login() {
             )}
           </div>
 
-          <AuthSubmitButton
+          <SubmitButton
+            type="submit"
             label="Login"
             className=" w-full text-center"
             loading={submitLoader}
           />
-          {process.env.NEXT_PUBLIC_DISABLE_REGISTRATION === "true" ? undefined : (
+          {process.env.NEXT_PUBLIC_DISABLE_REGISTRATION ===
+          "true" ? undefined : (
             <div className="flex items-baseline gap-1 justify-center">
-              <p className="w-fit text-gray-500 dark:text-gray-400">New here?</p>
+              <p className="w-fit text-gray-500 dark:text-gray-400">
+                New here?
+              </p>
               <Link
                 href={"/register"}
                 className="block text-black dark:text-white font-semibold"
diff --git a/pages/register.tsx b/pages/register.tsx
index a681c01..cc871b6 100644
--- a/pages/register.tsx
+++ b/pages/register.tsx
@@ -6,7 +6,6 @@ import { signIn } from "next-auth/react";
 import { useRouter } from "next/router";
 import CenteredForm from "@/layouts/CenteredForm";
 import TextInput from "@/components/TextInput";
-import AuthSubmitButton from "@/components/AuthSubmitButton";
 
 const emailEnabled = process.env.NEXT_PUBLIC_EMAIL_PROVIDER;
 
@@ -112,133 +111,136 @@ export default function Register() {
       ) : (
         <form onSubmit={registerUser}>
           <div className="p-4 flex flex-col gap-3 justify-between sm:w-[30rem] w-80 bg-slate-50 dark:bg-neutral-800 rounded-2xl shadow-md border border-sky-100 dark:border-neutral-700">
-          <p className="text-2xl text-black dark:text-white text-center font-bold">
-            Enter your details
-          </p>
-          <div>
-            <p className="text-sm text-black dark:text-white w-fit font-semibold mb-1">
-              Display Name
+            <p className="text-2xl text-black dark:text-white text-center font-bold">
+              Enter your details
             </p>
-
-            <TextInput
-              autoFocus={true}
-              placeholder="Johnny"
-              value={form.name}
-              className="bg-white"
-              onChange={(e) => setForm({ ...form, name: e.target.value })}
-            />
-          </div>
-
-          {emailEnabled ? undefined : (
             <div>
               <p className="text-sm text-black dark:text-white w-fit font-semibold mb-1">
-                Username
+                Display Name
               </p>
 
               <TextInput
-                placeholder="john"
-                value={form.username}
+                autoFocus={true}
+                placeholder="Johnny"
+                value={form.name}
                 className="bg-white"
-                onChange={(e) => setForm({ ...form, username: e.target.value })}
+                onChange={(e) => setForm({ ...form, name: e.target.value })}
               />
             </div>
-          )}
 
-          {emailEnabled ? (
-            <div>
-              <p className="text-sm text-black dark:text-white w-fit font-semibold mb-1">
-                Email
+            {emailEnabled ? undefined : (
+              <div>
+                <p className="text-sm text-black dark:text-white w-fit font-semibold mb-1">
+                  Username
+                </p>
+
+                <TextInput
+                  placeholder="john"
+                  value={form.username}
+                  className="bg-white"
+                  onChange={(e) =>
+                    setForm({ ...form, username: e.target.value })
+                  }
+                />
+              </div>
+            )}
+
+            {emailEnabled ? (
+              <div>
+                <p className="text-sm text-black dark:text-white w-fit font-semibold mb-1">
+                  Email
+                </p>
+
+                <TextInput
+                  type="email"
+                  placeholder="johnny@example.com"
+                  value={form.email}
+                  className="bg-white"
+                  onChange={(e) => setForm({ ...form, email: e.target.value })}
+                />
+              </div>
+            ) : undefined}
+
+            <div className="w-full">
+              <p className="text-sm text-black dark:text-white w-fit font-semibold  mb-1">
+                Password
               </p>
 
               <TextInput
-                type="email"
-                placeholder="johnny@example.com"
-                value={form.email}
+                type="password"
+                placeholder="••••••••••••••"
+                value={form.password}
                 className="bg-white"
-                onChange={(e) => setForm({ ...form, email: e.target.value })}
+                onChange={(e) => setForm({ ...form, password: e.target.value })}
               />
             </div>
-          ) : undefined}
 
-          <div className="w-full">
-            <p className="text-sm text-black dark:text-white w-fit font-semibold  mb-1">
-              Password
-            </p>
-
-            <TextInput
-              type="password"
-              placeholder="••••••••••••••"
-              value={form.password}
-              className="bg-white"
-              onChange={(e) => setForm({ ...form, password: e.target.value })}
-            />
-          </div>
-
-          <div className="w-full">
-            <p className="text-sm text-black dark:text-white w-fit font-semibold mb-1">
-              Confirm Password
-            </p>
-
-            <TextInput
-              type="password"
-              placeholder="••••••••••••••"
-              value={form.passwordConfirmation}
-              className="bg-white"
-              onChange={(e) =>
-                setForm({ ...form, passwordConfirmation: e.target.value })
-              }
-            />
-          </div>
-
-          {process.env.NEXT_PUBLIC_STRIPE_IS_ACTIVE ? (
-            <div>
-              <p className="text-xs text-gray-500 dark:text-gray-400">
-                By signing up, you agree to our{" "}
-                <Link
-                  href="https://linkwarden.app/tos"
-                  className="font-semibold underline"
-                >
-                  Terms of Service
-                </Link>{" "}
-                and{" "}
-                <Link
-                  href="https://linkwarden.app/privacy-policy"
-                  className="font-semibold underline"
-                >
-                  Privacy Policy
-                </Link>
-                .
-              </p>
-              <p className="text-xs text-gray-500 dark:text-gray-400">
-                Need help?{" "}
-                <Link
-                  href="mailto:support@linkwarden.app"
-                  className="font-semibold underline"
-                >
-                  Get in touch
-                </Link>
-                .
+            <div className="w-full">
+              <p className="text-sm text-black dark:text-white w-fit font-semibold mb-1">
+                Confirm Password
               </p>
+
+              <TextInput
+                type="password"
+                placeholder="••••••••••••••"
+                value={form.passwordConfirmation}
+                className="bg-white"
+                onChange={(e) =>
+                  setForm({ ...form, passwordConfirmation: e.target.value })
+                }
+              />
             </div>
-          ) : undefined}
 
-          <AuthSubmitButton
-            label="Sign Up"
-            className="mt-2 w-full text-center"
-            loading={submitLoader}
-          />
-          <div className="flex items-baseline gap-1 justify-center">
-            <p className="w-fit text-gray-500 dark:text-gray-400">
-              Already have an account?
-            </p>
-            <Link
-              href={"/login"}
-              className="block text-black dark:text-white font-bold"
-            >
-              Login
-            </Link>
+            {process.env.NEXT_PUBLIC_STRIPE_IS_ACTIVE ? (
+              <div>
+                <p className="text-xs text-gray-500 dark:text-gray-400">
+                  By signing up, you agree to our{" "}
+                  <Link
+                    href="https://linkwarden.app/tos"
+                    className="font-semibold underline"
+                  >
+                    Terms of Service
+                  </Link>{" "}
+                  and{" "}
+                  <Link
+                    href="https://linkwarden.app/privacy-policy"
+                    className="font-semibold underline"
+                  >
+                    Privacy Policy
+                  </Link>
+                  .
+                </p>
+                <p className="text-xs text-gray-500 dark:text-gray-400">
+                  Need help?{" "}
+                  <Link
+                    href="mailto:support@linkwarden.app"
+                    className="font-semibold underline"
+                  >
+                    Get in touch
+                  </Link>
+                  .
+                </p>
+              </div>
+            ) : undefined}
+
+            <SubmitButton
+              type="submit"
+              label="Sign Up"
+              className="mt-2 w-full text-center"
+              loading={submitLoader}
+            />
+            <div className="flex items-baseline gap-1 justify-center">
+              <p className="w-fit text-gray-500 dark:text-gray-400">
+                Already have an account?
+              </p>
+              <Link
+                href={"/login"}
+                className="block text-black dark:text-white font-bold"
+              >
+                Login
+              </Link>
+            </div>
           </div>
-        </div>
         </form>
       )}
     </CenteredForm>