diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 62150e0..26c9ba9 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -12,7 +12,7 @@ import { Providers } from "./providers";
 export const metadata: Metadata = {
   title: {
     template: "%s | NextAdmin - Next.js Dashboard Kit",
-    default: "NextAdmin - Next.js Dashboard Kit",
+    default: "Opp lens - panel",
   },
   description:
     "Next.js admin dashboard toolkit with 200+ templates, UI components, and integrations for fast dashboard development.",
diff --git a/src/components/FormElements/InputGroup/tag-input.tsx b/src/components/FormElements/InputGroup/tag-input.tsx
index 1da2cff..084f2cb 100644
--- a/src/components/FormElements/InputGroup/tag-input.tsx
+++ b/src/components/FormElements/InputGroup/tag-input.tsx
@@ -167,7 +167,7 @@ const TagInput = <T extends FieldValues>({
         <input
           type="hidden"
           {...(register ? register(name) : {})}
-          value={JSON.stringify(tags)}
+          value={tags.length > 0 ? JSON.stringify(tags) : ''}
           ref={ref}
         />
       </div>
diff --git a/src/components/Tables/companies/index.tsx b/src/components/Tables/companies/index.tsx
index f3c11de..ebea5d1 100644
--- a/src/components/Tables/companies/index.tsx
+++ b/src/components/Tables/companies/index.tsx
@@ -67,7 +67,7 @@ const CompaniesTable = ({}: IProps) => {
                 <TableHead className="text-start" colSpan={100}>
                   {company.email}
                 </TableHead>
-                <TableHead className="text-start" colSpan={100}>
+                <TableHead className="w-full text-start" colSpan={100}>
                   {formatPhoneNumber(company.phone)}
                 </TableHead>
                 <TableHead className="text-start" colSpan={100}>
diff --git a/src/components/forms/admins/CreateAdmin.tsx b/src/components/forms/admins/CreateAdmin.tsx
index 6fd71e5..d3135de 100644
--- a/src/components/forms/admins/CreateAdmin.tsx
+++ b/src/components/forms/admins/CreateAdmin.tsx
@@ -116,36 +116,37 @@ const CreateAdminForm: FC<IProps> = ({ defaultValues, editMode, id }) => {
               </p>
             )}
           </div>
-
-          <div>
-            <InputGroup
-              label="Password"
-              placeholder="Password"
-              autoComplete="new-password"
-              required
-              type="password"
-              {...register("password", {
-                required: {
-                  value: true,
-                  message: FormErrorMessages.required,
-                },
-                minLength: {
-                  value: 8,
-                  message: FormErrorMessages.minLength(8),
-                },
-                maxLength: {
-                  value: 128,
-                  message: FormErrorMessages.maxLength(128),
-                },
-              })}
-              name="password"
-            />
-            {errors.password && (
-              <p className="mt-1 text-sm text-red-500">
-                {errors.password.message}
-              </p>
-            )}
-          </div>
+          {!editMode && (
+            <div>
+              <InputGroup
+                label="Password"
+                placeholder="Password"
+                autoComplete="new-password"
+                required
+                type="password"
+                {...register("password", {
+                  required: {
+                    value: true,
+                    message: FormErrorMessages.required,
+                  },
+                  minLength: {
+                    value: 8,
+                    message: FormErrorMessages.minLength(8),
+                  },
+                  maxLength: {
+                    value: 128,
+                    message: FormErrorMessages.maxLength(128),
+                  },
+                })}
+                name="password"
+              />
+              {errors.password && (
+                <p className="mt-1 text-sm text-red-500">
+                  {errors.password.message}
+                </p>
+              )}
+            </div>
+          )}
 
           <div>
             <InputGroup
diff --git a/src/components/forms/companies/useCreateCompanyPresenter.ts b/src/components/forms/companies/useCreateCompanyPresenter.ts
index 0a51258..2941204 100644
--- a/src/components/forms/companies/useCreateCompanyPresenter.ts
+++ b/src/components/forms/companies/useCreateCompanyPresenter.ts
@@ -34,7 +34,7 @@ const useCreateCompanyPresenter = ({ defaultValues, editMode, id }: IProps) => {
 
   useEffect(() => {
     if (defaultValues) {
-      const categories = defaultValues?.tags.categories.map(
+      const categories = defaultValues?.tags?.categories?.map(
         (item: any) => item.id,
       );
       setValue("tags.categories", categories);
@@ -52,6 +52,19 @@ const useCreateCompanyPresenter = ({ defaultValues, editMode, id }: IProps) => {
       founded_year: data.founded_year ? +data.founded_year : 0,
       employee_count: data.employee_count ? +data.employee_count : 0,
       annual_revenue: data.annual_revenue ? +data.annual_revenue : 0,
+      tags: {
+        keywords: data?.tags?.keywords?.length ? data?.tags?.keywords : [],
+        categories: data?.tags?.categories?.length
+          ? data?.tags?.categories
+          : [],
+        cpv_codes: data?.tags?.cpv_codes?.length ? data?.tags?.cpv_codes : [],
+        specializations: data?.tags?.specializations?.length
+          ? data?.tags?.specializations
+          : [],
+        certifications: data?.tags?.certifications?.length
+          ? data?.tags?.certifications
+          : [],
+      },
     };
     if (editMode) {
       updateCompany({
@@ -61,7 +74,9 @@ const useCreateCompanyPresenter = ({ defaultValues, editMode, id }: IProps) => {
     } else {
       createCompany(formattedData as ICreateCompanyCredentials);
     }
+
   };
+
   const handleCancel = () => {
     reset();
     router.back();
diff --git a/src/components/forms/customers/CreateCustomer.tsx b/src/components/forms/customers/CreateCustomer.tsx
index 3dadf1c..f7ccbce 100644
--- a/src/components/forms/customers/CreateCustomer.tsx
+++ b/src/components/forms/customers/CreateCustomer.tsx
@@ -108,28 +108,34 @@ const CreateCustomer = ({ defaultValues, editMode, id }: IProps) => {
             placeholder="Select Role"
           />
         </div>
-        <div className="flex flex-col gap-2">
-          <InputGroup
-            {...register("password", {
-              required: { value: true, message: FormErrorMessages.required },
-              minLength: { value: 8, message: FormErrorMessages.minLength(8) },
-              maxLength: {
-                value: 128,
-                message: FormErrorMessages.maxLength(128),
-              },
-            })}
-            disabled={editMode}
-            name="password"
-            label="Password"
-            type="password"
-            placeholder="Enter password"
-          />
-          {errors.password && (
-            <p className="mt-1 text-sm text-red-500">
-              {errors.password.message}
-            </p>
-          )}
-        </div>
+        {!editMode && (
+          <div className="flex flex-col gap-2">
+            <InputGroup
+              {...register("password", {
+                required: { value: true, message: FormErrorMessages.required },
+                minLength: {
+                  value: 8,
+                  message: FormErrorMessages.minLength(8),
+                },
+                maxLength: {
+                  value: 128,
+                  message: FormErrorMessages.maxLength(128),
+                },
+              })}
+              disabled={editMode}
+              name="password"
+              label="Password"
+              type="password"
+              placeholder="Enter password"
+            />
+            {errors.password && (
+              <p className="mt-1 text-sm text-red-500">
+                {errors.password.message}
+              </p>
+            )}
+          </div>
+        )}
+
         <div className="flex flex-col gap-2">
           <InputGroup
             {...register("full_name", {