diff --git a/client/components/login/SignupForm.tsx b/client/components/login/SignupForm.tsx
index a0a8ab3..d4ccc51 100644
--- a/client/components/login/SignupForm.tsx
+++ b/client/components/login/SignupForm.tsx
@@ -1,18 +1,14 @@
 import { zodResolver } from "@hookform/resolvers/zod"
-import { SelfServiceRegistrationFlow } from "@ory/client"
-import { useRouter } from "next/router"
-import { FC, useEffect, useState } from "react"
+import { FC } from "react"
 import { SubmitHandler, useForm } from "react-hook-form"
 import { z } from "zod"
-import ory from "../../services/ory"
 
 import FormField from "../common/form/FormField"
 import InlineLink from "../common/InlineLink"
 import Input from "../common/Input"
 import SubmitButton from "../common/form/SubmitButton"
-
-const PASSWORD_REGEX =
-  /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$ %^&*-]).{8,64}$/
+import { PASSWORD_REGEX } from "../../config"
+import useSignUpFlow from "../../hooks/useSignUpFlow"
 
 const SignupFormSchema = z
   .object({
@@ -47,71 +43,35 @@ const formFields = [
 ]
 
 const SignupForm: FC = () => {
-  const router = useRouter()
-  const [flow, setFlow] = useState<SelfServiceRegistrationFlow>()
-  const { flow: flowId, return_to: returnTo } = router.query
+  const signUpFlow = useSignUpFlow()
   const { register, handleSubmit, formState } = useForm<SignupFormValues>({
     resolver: zodResolver(SignupFormSchema),
   })
 
-  useEffect(() => {
-    const func = async () => {
-      if (!router.isReady || flow) {
-        return
-      }
-
-      let serviceFlow
-      if (flowId) {
-        serviceFlow = await ory.getSelfServiceRegistrationFlow(String(flowId))
-      } else {
-        serviceFlow =
-          await ory.initializeSelfServiceRegistrationFlowForBrowsers(
-            returnTo ? String(returnTo) : undefined,
-          )
-      }
-
-      setFlow(serviceFlow.data)
-    }
-
-    func()
-  }, [flowId, router, router.isReady, returnTo, flow])
-
   const onSubmit: SubmitHandler<SignupFormValues> = async (data) => {
-    await router.push(`/signup?flow=${flow?.id}`, undefined, {
-      shallow: true,
+    await signUpFlow.submitData({
+      csrf_token: data.csrfToken,
+      method: "password",
+      password: data.password,
+      traits: {
+        email: data.email,
+      },
     })
-    try {
-      const resp = await ory.submitSelfServiceRegistrationFlow(
-        String(flow?.id),
-        {
-          csrf_token: data.csrfToken,
-          method: "password",
-          password: data.password,
-          traits: {
-            email: data.email,
-            // username: data.username,
-          },
-        },
-      )
-      console.log(resp)
-    } catch (e) {
-      console.log(e)
-    }
   }
 
   return (
     <form onSubmit={handleSubmit(onSubmit)} className="space-y-4">
-      {flow && (
-        <Input
-          hidden={true}
-          value={flow.ui.nodes[0].attributes.value}
-          {...register("csrfToken")}
-        />
-      )}
       <p className="text-sm">
         Creating an account allows you to participate in chat, follow your
         favorite channels, and broadcast from your own channel.
       </p>
+      {signUpFlow.flow && (
+        <Input
+          hidden={true}
+          value={signUpFlow.flow.ui.nodes[0].attributes.value}
+          {...register("csrfToken")}
+        />
+      )}
       {formFields.map((field) => (
         <FormField
           key={field.id}
@@ -134,7 +94,11 @@ const SignupForm: FC = () => {
         </InlineLink>
         .
       </p>
-      <SubmitButton className="w-full" value="Sign Up" />
+      <SubmitButton
+        disabled={!signUpFlow.flow}
+        className="w-full"
+        value="Sign Up"
+      />
     </form>
   )
 }
diff --git a/client/components/nav/NavBar.tsx b/client/components/nav/NavBar.tsx
index 7de64e0..1474791 100644
--- a/client/components/nav/NavBar.tsx
+++ b/client/components/nav/NavBar.tsx
@@ -2,7 +2,6 @@ import { UserIcon } from "@heroicons/react/24/outline"
 import { FC, useState } from "react"
 
 import Button from "../common/Button"
-import Input from "../common/Input"
 import LoginModal from "../login/LoginModal"
 
 const NavBar: FC = () => {
diff --git a/client/config/index.ts b/client/config/index.ts
index 3a2a2b0..831ff05 100644
--- a/client/config/index.ts
+++ b/client/config/index.ts
@@ -1 +1,3 @@
 export const KRATOS_URL = "http://127.0.0.1:4433"
+export const PASSWORD_REGEX =
+  /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$ %^&*-]).{8,64}$/
diff --git a/client/hooks/useSignUpFlow.ts b/client/hooks/useSignUpFlow.ts
new file mode 100644
index 0000000..2a86672
--- /dev/null
+++ b/client/hooks/useSignUpFlow.ts
@@ -0,0 +1,54 @@
+import {
+  SelfServiceRegistrationFlow,
+  SubmitSelfServiceRegistrationFlowBody,
+} from "@ory/client"
+import { useRouter } from "next/router"
+import { useEffect, useState } from "react"
+import ory from "../services/ory"
+
+export const useSignUpFlow = () => {
+  const router = useRouter()
+  const [flow, setFlow] = useState<SelfServiceRegistrationFlow>()
+  const { flow: flowId, return_to: returnTo } = router.query
+
+  useEffect(() => {
+    const func = async () => {
+      if (!router.isReady || flow) {
+        return
+      }
+
+      let serviceFlow
+      if (flowId) {
+        serviceFlow = await ory.getSelfServiceRegistrationFlow(String(flowId))
+      } else {
+        serviceFlow =
+          await ory.initializeSelfServiceRegistrationFlowForBrowsers(
+            returnTo ? String(returnTo) : undefined,
+          )
+      }
+
+      setFlow(serviceFlow.data)
+    }
+
+    func()
+  }, [flowId, router, router.isReady, returnTo, flow])
+
+  const submitData = async (data: SubmitSelfServiceRegistrationFlowBody) => {
+    await router.push(`/signup?flow=${flow?.id}`, undefined, {
+      shallow: true,
+    })
+    try {
+      const resp = await ory.submitSelfServiceRegistrationFlow(
+        String(flow?.id),
+        data,
+      )
+      // TODO: handle registration
+    } catch (e) {
+      // TODO: handle errors
+    }
+  }
+
+  return { flow, submitData }
+}
+
+export default useSignUpFlow