diff --git a/src/components/company-form.tsx b/src/components/company-form.tsx
index 39772a80..470724e4 100644
--- a/src/components/company-form.tsx
+++ b/src/components/company-form.tsx
@@ -76,7 +76,7 @@ export const CompanyForm = ({ setIsDialogOpen }: any) => {
   };
 
   const handleFileChange = async (e: any) => {
-    const selectedFile = e.target.files[0];
+    const selectedFile = e.target.files?.[0];
     if (!selectedFile) return;
 
     // Basic file validation
@@ -88,6 +88,8 @@ export const CompanyForm = ({ setIsDialogOpen }: any) => {
       });
     }
 
+    setFile(selectedFile);
+
     const reader = new FileReader();
     reader.onload = () => {
       if (companyLogoImg.current) {
@@ -95,8 +97,8 @@ export const CompanyForm = ({ setIsDialogOpen }: any) => {
       }
       setPreviewImg(reader.result as string);
     };
+
     reader.readAsDataURL(selectedFile);
-    setFile(selectedFile);
   };
 
   const handleDescriptionChange = (fieldName: any, value: string) => {
diff --git a/src/components/job-form.tsx b/src/components/job-form.tsx
index c80a24af..8dd2e358 100644
--- a/src/components/job-form.tsx
+++ b/src/components/job-form.tsx
@@ -626,22 +626,35 @@ const PostJobForm = () => {
               <h2 className="text-lg font-semibold mb-4 dark:text-gray-300">
                 Company
               </h2>
-              <FormControl>
-                <Select>
-                  <SelectTrigger className="bg-gray-800 border-none text-white">
-                    <SelectValue placeholder="Select a company that you have already posted job for" />
-                  </SelectTrigger>
-                  <SelectContent>
-                    {companies.map((company, index) => {
-                      return (
-                        <SelectItem key={index} value={company.id}>
-                          {company.name}
-                        </SelectItem>
-                      );
-                    })}
-                  </SelectContent>
-                </Select>
-              </FormControl>
+              <FormField
+                control={form.control}
+                name="companyId"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel className="font-medium">
+                      Select a Company*
+                    </FormLabel>
+                    <FormControl>
+                      <Select
+                        onValueChange={field.onChange}
+                        value={field.value}
+                      >
+                        <SelectTrigger className="bg-gray-800 border-none text-white">
+                          <SelectValue placeholder="Select a company that you have already posted a job for" />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {companies.map((company, index) => (
+                            <SelectItem key={index} value={company.id}>
+                              {company.name}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    </FormControl>
+                  </FormItem>
+                )}
+              />
+
               <div className="flex gap-3 w-full p-6 mx-auto justify-center items-center">
                 <Separator className="w-1/2" /> OR{' '}
                 <Separator className="w-1/2" />
diff --git a/src/lib/validators/jobs.validator.ts b/src/lib/validators/jobs.validator.ts
index 19c0c294..81d95340 100644
--- a/src/lib/validators/jobs.validator.ts
+++ b/src/lib/validators/jobs.validator.ts
@@ -5,12 +5,6 @@ import { SortByEnums } from '../constant/jobs.constant';
 export const JobPostSchema = z
   .object({
     companyId: z.string().min(1, 'Company id is required'),
-    company: z.object({
-      id: z.string().min(1, 'Company id is required'),
-      name: z.string().min(1, 'Company name is required'),
-      bio: z.string().min(1, 'Company bio is required'),
-      logo: z.string().min(1, 'Company logo is required'),
-    }),
     title: z.string().min(1, 'Title is required'),
     description: z.string().min(1, 'Description is required'),
     city: z.string().min(1, 'City Name is required'),