diff --git a/0_Framework/Application/UID/IUidService.cs b/0_Framework/Application/UID/IUidService.cs
index 19dd0034..c2c26bd5 100644
--- a/0_Framework/Application/UID/IUidService.cs
+++ b/0_Framework/Application/UID/IUidService.cs
@@ -38,7 +38,7 @@ public class UidBasicInformation
     {
         "GENDER_MALE" => Application.Gender.Male,
         "GENDER_FEMALE" => Application.Gender.Female,
-        _ => throw new ArgumentOutOfRangeException()
+        _ => Application.Gender.None
     };
 }
 public record IdentificationInformation(string NationalId, string BirthDate, string ShenasnameSeri, string ShenasnameSerial, string ShenasnamehNumber);
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Employees/Create.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Employees/Create.cshtml
index 32b0cd0e..c0921767 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Employees/Create.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/Employees/Create.cshtml
@@ -571,6 +571,12 @@
                             } else if (response.data.gender === 1) {
                                 $('#GenderFemale').prop('checked', true);
                                 $('#soldier').prop('disabled', true);
+                            }
+                            else{
+                                $('#GenderMale').removeClass("disable");
+                                $('#GenderFemale').removeClass("disable");
+                                $('#divGender .radio-box').removeClass('disable');
+                                
                             }
                                 currentStep++;
                             showStep(currentStep);
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Employees/CreateEmployee.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Employees/CreateEmployee.cshtml
index 4df980de..28543bbb 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Employees/CreateEmployee.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/Employees/CreateEmployee.cshtml
@@ -571,6 +571,11 @@
                             } else if (response.data.gender === 1) {
                                 $('#GenderFemale').prop('checked', true);
                                 $('#soldier').prop('disabled', true);
+                            }
+                            else{
+                                $('#GenderMale').removeClass("disable");
+                                $('#GenderFemale').removeClass("disable");
+                                $('#divGender .radio-box').removeClass('disable');
                             }
                                 currentStep++;
                             showStep(currentStep);