diff --git a/src/components/forms/customers/CreateCustomer.tsx b/src/components/forms/customers/CreateCustomer.tsx
index 0633240..0c18c67 100644
--- a/src/components/forms/customers/CreateCustomer.tsx
+++ b/src/components/forms/customers/CreateCustomer.tsx
@@ -47,6 +47,7 @@ const CreateCustomer = ({ defaultValues, editMode, id }: IProps) => {
             label="Username"
             type="text"
             placeholder="Enter username"
+            required
           />
           {errors.username && (
             <p className="mt-1 text-sm text-red-500">
@@ -67,11 +68,8 @@ const CreateCustomer = ({ defaultValues, editMode, id }: IProps) => {
                 : []
             }
             placeholder="Select companies to assign"
-            {...register("companies", {
-              required: "Please select at least one interest",
-            })}
+            {...register("companies")}
             errors={errors}
-            required
           />
         </div>
         <div className="flex flex-col gap-2">
@@ -86,6 +84,7 @@ const CreateCustomer = ({ defaultValues, editMode, id }: IProps) => {
             name="email"
             label="Email"
             type="email"
+            required
             placeholder="Enter email"
           />
           {errors.email && (
@@ -102,6 +101,7 @@ const CreateCustomer = ({ defaultValues, editMode, id }: IProps) => {
             value={watch("role")}
             items={getEnumAsArray(AdminRoles)}
             placeholder="Select Role"
+            required
           />
         </div>
         {!editMode && (
@@ -123,6 +123,7 @@ const CreateCustomer = ({ defaultValues, editMode, id }: IProps) => {
               label="Password"
               type="password"
               placeholder="Enter password"
+              required={!editMode}
             />
             {errors.password && (
               <p className="mt-1 text-sm text-red-500">
@@ -184,6 +185,7 @@ const CreateCustomer = ({ defaultValues, editMode, id }: IProps) => {
             })}
             name="type"
             label="Type"
+            required
             value={watch("type")}
             placeholder="Select Type"
             prefixIcon={<GlobeIcon />}