diff --git a/components/auth/AuthForm.tsx b/components/auth/AuthForm.tsx
index f87458b2c9..599a2a280c 100644
--- a/components/auth/AuthForm.tsx
+++ b/components/auth/AuthForm.tsx
@@ -2,7 +2,7 @@
 
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Icon } from "@iconify/react";
-import { Button, Checkbox, Divider, Input, Link } from "@nextui-org/react";
+import { Button, Checkbox, Divider, Link } from "@nextui-org/react";
 import { useState } from "react";
 import { useFormState } from "react-dom";
 import { useForm } from "react-hook-form";
@@ -25,24 +25,23 @@ import { AuthButton } from "./AuthButton";
 export const AuthForm = ({ type }: { type: string }) => {
   const [user, setUser] = useState(null);
 
-  const [state, dispath] = useFormState(authenticate, undefined);
+  const formSchema = authFormSchema(type);
+  // const [state, dispath] = useFormState(authenticate, undefined);
 
-  const form = useForm<z.infer<typeof authFormSchema>>({
-    resolver: zodResolver(authFormSchema),
+  const form = useForm<z.infer<typeof formSchema>>({
+    resolver: zodResolver(formSchema),
     defaultValues: {
-      username: "",
+      email: "",
       password: "",
     },
   });
 
-  const onSubmit = (values: z.infer<typeof authFormSchema>) => {
+  const onSubmit = (values: z.infer<typeof formSchema>) => {
     // Do something with the form values
     // this will be type-safe and validated
     console.log(values);
   };
 
-  console.log(state);
-
   return (
     <div
       className="flex h-screen w-screen items-center justify-start overflow-hidden rounded-small bg-content1 p-2 sm:p-4 lg:p-8"
@@ -74,29 +73,50 @@ export const AuthForm = ({ type }: { type: string }) => {
         <p className="pb-2 text-xl font-medium">
           {type === "sign-in" ? "Sign In" : "Sign Up"}
         </p>
-        {/* Sign UP Form */}
-        {type === "sign-up" && (
-          <Form {...form}>
-            <form
-              className="flex flex-col gap-3"
-              onSubmit={form.handleSubmit(onSubmit)}
-            >
-              <CustomInput
-                control={form.control}
-                name="username"
-                type="text"
-                label="Username"
-                placeholder="Enter your username"
-              />
-              <CustomInput
-                control={form.control}
-                name="email"
-                type="email"
-                label="Email"
-                placeholder="Enter your email"
-              />
-              <CustomInput control={form.control} password />
-              {/* <Input
+
+        <Form {...form}>
+          <form
+            className="flex flex-col gap-3"
+            onSubmit={form.handleSubmit(onSubmit)}
+          >
+            {type === "sign-up" && (
+              <>
+                <CustomInput
+                  control={form.control}
+                  name="firstName"
+                  type="text"
+                  label="Name"
+                  placeholder="Enter your name"
+                />
+                <CustomInput
+                  control={form.control}
+                  name="companyName"
+                  type="text"
+                  label="Company Name"
+                  placeholder="Enter your company name"
+                />
+              </>
+            )}
+            <CustomInput
+              control={form.control}
+              name="email"
+              type="email"
+              label="Email"
+              placeholder="Enter your email"
+            />
+
+            <CustomInput control={form.control} password />
+            {type === "sign-in" && (
+              <div className="flex items-center justify-between px-1 py-2">
+                <Checkbox name="remember" size="sm">
+                  Remember me
+                </Checkbox>
+                <Link className="text-default-500" href="#">
+                  Forgot password?
+                </Link>
+              </div>
+            )}
+            {/* <Input
                 isRequired
                 endContent={
                   <button type="button" onClick={toggleConfirmVisibility}>
@@ -119,42 +139,40 @@ export const AuthForm = ({ type }: { type: string }) => {
                 type={isConfirmVisible ? "text" : "password"}
                 variant="bordered"
               /> */}
-              <Checkbox isRequired className="py-4" size="sm">
-                I agree with the&nbsp;
-                <Link href="#" size="sm">
-                  Terms
-                </Link>
-                &nbsp; and&nbsp;
-                <Link href="#" size="sm">
-                  Privacy Policy
-                </Link>
-              </Checkbox>
-              <AuthButton type={type} />
-            </form>
-          </Form>
-        )}
-        {/* Sign IN Form */}
+            {type === "sign-up" && (
+              <FormField
+                control={form.control}
+                name="termsAndConditions"
+                render={({ field }) => (
+                  <>
+                    <FormControl>
+                      <Checkbox
+                        isRequired
+                        className="py-4"
+                        size="sm"
+                        {...field}
+                      >
+                        I agree with the&nbsp;
+                        <Link href="#" size="sm">
+                          Terms
+                        </Link>
+                        &nbsp; and&nbsp;
+                        <Link href="#" size="sm">
+                          Privacy Policy
+                        </Link>
+                      </Checkbox>
+                    </FormControl>
+                    <FormMessage />
+                  </>
+                )}
+              />
+            )}
+
+            <AuthButton type={type} />
+          </form>
+        </Form>
         {type === "sign-in" && (
           <>
-            <form className="flex flex-col gap-3" action={dispath}>
-              <Input
-                label="Email Address"
-                name="email"
-                placeholder="Enter your email"
-                type="email"
-                variant="bordered"
-              />
-
-              <div className="flex items-center justify-between px-1 py-2">
-                <Checkbox name="remember" size="sm">
-                  Remember me
-                </Checkbox>
-                <Link className="text-default-500" href="#">
-                  Forgot password?
-                </Link>
-              </div>
-              <AuthButton type={type} />
-            </form>
             <div className="flex items-center gap-4 py-2">
               <Divider className="flex-1" />
               <p className="shrink-0 text-tiny text-default-500">OR</p>
@@ -184,7 +202,6 @@ export const AuthForm = ({ type }: { type: string }) => {
             </div>
           </>
         )}
-
         {type === "sign-in" ? (
           <p className="text-center text-small">
             Need to create an account?&nbsp;
diff --git a/components/ui/custom/CustomInput.tsx b/components/ui/custom/CustomInput.tsx
index 07ea994a46..b1d57a5a29 100644
--- a/components/ui/custom/CustomInput.tsx
+++ b/components/ui/custom/CustomInput.tsx
@@ -9,18 +9,20 @@ import { z } from "zod";
 import { FormControl, FormField, FormMessage } from "@/components/ui/form";
 import { authFormSchema } from "@/types";
 
+const formSchema = authFormSchema("sign-up");
+
 type CustomInputProps =
   | {
-      control: Control<z.infer<typeof authFormSchema>>;
-      name: FieldPath<z.infer<typeof authFormSchema>>;
-      password?: false;
+      control: Control<z.infer<typeof formSchema>>;
+      name: FieldPath<z.infer<typeof formSchema>>;
       label: string;
       type: "text" | "email";
       placeholder: string;
       isRequired?: boolean;
+      password?: false;
     }
   | {
-      control: Control<z.infer<typeof authFormSchema>>;
+      control: Control<z.infer<typeof formSchema>>;
       password: true;
       name?: never;
       label?: never;
@@ -42,32 +44,28 @@ export const CustomInput = ({
 
   const toggleVisibility = () => setIsVisible(!isVisible);
 
-  const inputProps = password
-    ? {
-        name: "password",
-        label: "Password",
-        type: isVisible ? "text" : "password",
-        placeholder: "Enter your password",
-        isRequired: true,
-      }
-    : { name, label, type, placeholder, isRequired };
+  const inputName = password ? "password" : name!;
+  const inputLabel = password ? "Password" : label;
+  const inputType = password ? (isVisible ? "text" : "password") : type;
+  const inputPlaceholder = password ? "Enter your password" : placeholder;
+  const inputIsRequired = password ? true : isRequired;
 
   return (
     <FormField
       control={control}
-      name={inputProps.name}
+      name={inputName as FieldPath<z.infer<typeof formSchema>>}
       render={({ field }) => (
         <>
           <FormControl>
             <Input
-              isRequired={inputProps.isRequired}
-              label={inputProps.label}
-              placeholder={inputProps.placeholder}
-              type={inputProps.type}
+              isRequired={inputIsRequired}
+              label={inputLabel}
+              placeholder={inputPlaceholder}
+              type={inputType}
               variant="bordered"
               {...field}
               endContent={
-                password && (
+                password ? (
                   <button type="button" onClick={toggleVisibility}>
                     <Icon
                       className="pointer-events-none text-2xl text-default-400"
@@ -76,7 +74,7 @@ export const CustomInput = ({
                       }
                     />
                   </button>
-                )
+                ) : null
               }
             />
           </FormControl>
diff --git a/types/auth.ts b/types/auth.ts
index f359f53883..2f1676d945 100644
--- a/types/auth.ts
+++ b/types/auth.ts
@@ -1,12 +1,27 @@
 import { z } from "zod";
 
-export const authFormSchema = z.object({
-  username: z
-    .string()
-    .min(4, {
-      message: "Username must be at least 4 characters.",
-    })
-    .max(20),
-  password: z.string().min(6),
-  email: z.string().email(),
-});
+export const authFormSchema = (type: string) =>
+  z.object({
+    // Sign Up
+    companyName: type === "sign-in" ? z.string().optional() : z.string().min(3),
+    firstName:
+      type === "sign-in"
+        ? z.string().optional()
+        : z
+            .string()
+            .min(3, {
+              message: "The name must be at least 3 characters.",
+            })
+            .max(20),
+    termsAndConditions:
+      type === "sign-in"
+        ? z.literal(true).optional()
+        : z.literal(true, {
+            errorMap: () => ({
+              message: "You must accept the terms and conditions.",
+            }),
+          }),
+    // both
+    email: z.string().email(),
+    password: z.string().min(6),
+  });