diff --git a/ipi-survey-platform/src/pages/Admin/configuration/EditCompanyProfile.jsx b/ipi-survey-platform/src/pages/Admin/configuration/EditCompanyProfile.jsx
index a8e147f..1dfe55f 100644
--- a/ipi-survey-platform/src/pages/Admin/configuration/EditCompanyProfile.jsx
+++ b/ipi-survey-platform/src/pages/Admin/configuration/EditCompanyProfile.jsx
@@ -194,7 +194,7 @@ const EditCompanyProfile = () => {
         return true;
       }
     }
-   
+   console.log('Validating step:', stepIndex, 'with form values:', form);
     const requiredFields = requiredFieldsByStep[stepIndex] || [];
     if (!requiredFields.length) return true;
    
@@ -805,7 +805,7 @@ const EditCompanyProfile = () => {
       // Find emirate and city IDs by name for the API call
       const selectedEmirate = emirateOptions.find(opt => opt.label === form.contactEmirate);
       const selectedCity = contactCityOptions.find(opt => opt.label === form.contactCityTown);
- 
+      console.log('Selected Emirate:', form);
       const establishmentData = {
         establishment_code: form.uniqueLicenseNumber || "",
         factory_name: form.contactName || "",
@@ -828,10 +828,10 @@ const EditCompanyProfile = () => {
         establishment_mobile_number: form.contactMobileNumber || "",
         establishment_contact_email: form.contactEmail || "",
         establishment_website: form.contactWebsite || "",
-        emirati_male: Number(form.employmentEmiratiMale) || '',
-        emirati_female: Number(form.employmentEmiratiFemale) || '',
-        non_emirati_male: Number(form.employmentNonEmiratiMale) || '',
-        non_emirati_female: Number(form.employmentNonEmiratiFemale) || '',
+        emirati_male: form.employmentEmiratiMale ? Number(form.employmentEmiratiMale) : 0,
+        emirati_female: form.employmentEmiratiFemale ? Number(form.employmentEmiratiFemale) : 0,
+        non_emirati_male: form.employmentNonEmiratiMale ? Number(form.employmentNonEmiratiMale) : 0,
+        non_emirati_female: form.employmentNonEmiratiFemale ? Number(form.employmentNonEmiratiFemale) : 0,
         total_emirati:
           (Number(form.employmentEmiratiMale) || 0) +
           (Number(form.employmentEmiratiFemale) || 0),
@@ -1429,7 +1429,7 @@ const EditCompanyProfile = () => {
             <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
               <TextField
                 label="Number of Emirati Male"
-                value={form.employmentEmiratiMale || ""}
+                value={form?.employmentEmiratiMale}
                 onChange={(e) => {
                   if (e.target.value === '' || /^\d+$/.test(e.target.value)) {
                     handleFormChange("employmentEmiratiMale", e.target.value);
@@ -1437,7 +1437,7 @@ const EditCompanyProfile = () => {
                 }}
                 placeholder="Enter Count"
                 width="100%"
-                type="text"
+                type="Number"
                 required
                 inputMode="numeric"
                 pattern="[0-9]*"
@@ -1445,7 +1445,7 @@ const EditCompanyProfile = () => {
               />
               <TextField
                 label="Number of Non-Emirati Male"
-                value={form.employmentNonEmiratiMale || ""}
+                value={form?.employmentNonEmiratiMale }
                 onChange={(e) => {
                   if (e.target.value === '' || /^\d+$/.test(e.target.value)) {
                     handleFormChange("employmentNonEmiratiMale", e.target.value);
@@ -1453,7 +1453,7 @@ const EditCompanyProfile = () => {
                 }}
                 placeholder="Enter Count"
                 width="100%"
-                type="text"
+                type="Number"
                 inputMode="numeric"
                 pattern="[0-9]*"
                 required
@@ -1461,7 +1461,7 @@ const EditCompanyProfile = () => {
               />
               <TextField
                 label="Number of Emirati Female"
-                value={form.employmentEmiratiFemale || ""}
+                value={form?.employmentEmiratiFemale }
                 onChange={(e) => {
                   if (e.target.value === '' || /^\d+$/.test(e.target.value)) {
                     handleFormChange("employmentEmiratiFemale", e.target.value);
@@ -1469,7 +1469,7 @@ const EditCompanyProfile = () => {
                 }}
                 placeholder="Enter Count"
                 width="100%"
-                type="text"
+                type="Number"
                 inputMode="numeric"
                 pattern="[0-9]*"
                 required
@@ -1477,7 +1477,7 @@ const EditCompanyProfile = () => {
               />
               <TextField
                 label="Number of Non-Emirati Female"
-                value={form.employmentNonEmiratiFemale || ""}
+                value={form?.employmentNonEmiratiFemale }
                 onChange={(e) => {
                   if (e.target.value === '' || /^\d+$/.test(e.target.value)) {
                     handleFormChange("employmentNonEmiratiFemale", e.target.value);
@@ -1485,7 +1485,7 @@ const EditCompanyProfile = () => {
                 }}
                 placeholder="Enter Count"
                 width="100%"
-                type="text"
+                type="Number"
                 inputMode="numeric"
                 pattern="[0-9]*"
                 required
@@ -1493,7 +1493,7 @@ const EditCompanyProfile = () => {
               />
               <TextField
                 label="Total Employees"
-                value={form.employmentTotalEmployees || ""}
+                value={form?.employmentTotalEmployees }
                 placeholder="Total Employees"
                 width="100%"
                 type="number"
@@ -1502,7 +1502,7 @@ const EditCompanyProfile = () => {
               />
               <TextField
                 label="Total Emirati"
-                value={form.employmentTotalEmirati || ""}
+                value={form?.employmentTotalEmirati }
                 placeholder="Total Emirati"
                 width="100%"
                 type="number"