diff --git a/src/main/java/com/primefactorsolutions/views/EmployeeView.java b/src/main/java/com/primefactorsolutions/views/EmployeeView.java
index 26bde89..3f057dc 100644
--- a/src/main/java/com/primefactorsolutions/views/EmployeeView.java
+++ b/src/main/java/com/primefactorsolutions/views/EmployeeView.java
@@ -382,38 +382,38 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
         emergencyCEmail.setReadOnly(true);
         upload.setVisible(true);
         profileImagePreview.setVisible(true);
-        age.setVisible(true);
-        gender.setVisible(true);
-        status.setVisible(true);
-        ci.setVisible(true);
-        issuedIn.setVisible(true);
-        pTitle1.setVisible(true);
-        pTitle2.setVisible(true);
-        pTitle3.setVisible(true);
-        pStudy1.setVisible(true);
-        pStudy2.setVisible(true);
-        pStudy3.setVisible(true);
-        certification1.setVisible(true);
-        certification2.setVisible(true);
-        certification3.setVisible(true);
-        certification4.setVisible(true);
-        recognition.setVisible(true);
-        achievements.setVisible(true);
-        language.setVisible(true);
-        languageLevel.setVisible(true);
-        cod.setVisible(true);
-        leadManager.setVisible(true);
-        project.setVisible(true);
-        dateOfEntry.setVisible(true);
-        dateOfExit.setVisible(true);
-        contractType.setVisible(true);
-        seniority.setVisible(true);
-        salary.setVisible(true);
-        bankName.setVisible(true);
-        accountNumber.setVisible(true);
-        gpss.setVisible(true);
-        sss.setVisible(true);
-        beneficiaries.setVisible(true);
+        age.setReadOnly(true);
+        gender.setReadOnly(true);
+        status.setReadOnly(true);
+        ci.setReadOnly(true);
+        issuedIn.setReadOnly(true);
+        pTitle1.setReadOnly(true);
+        pTitle2.setReadOnly(true);
+        pTitle3.setReadOnly(true);
+        pStudy1.setReadOnly(true);
+        pStudy2.setReadOnly(true);
+        pStudy3.setReadOnly(true);
+        certification1.setReadOnly(true);
+        certification2.setReadOnly(true);
+        certification3.setReadOnly(true);
+        certification4.setReadOnly(true);
+        recognition.setReadOnly(true);
+        achievements.setReadOnly(true);
+        language.setReadOnly(true);
+        languageLevel.setReadOnly(true);
+        cod.setReadOnly(true);
+        leadManager.setReadOnly(true);
+        project.setReadOnly(true);
+        dateOfEntry.setReadOnly(true);
+        dateOfExit.setReadOnly(true);
+        contractType.setReadOnly(true);
+        seniority.setReadOnly(true);
+        salary.setReadOnly(true);
+        bankName.setReadOnly(true);
+        accountNumber.setReadOnly(true);
+        gpss.setReadOnly(true);
+        sss.setReadOnly(true);
+        beneficiaries.setReadOnly(true);
     }
 
     private void setFieldsEditable() {
@@ -433,43 +433,44 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
         emergencyCPhone.setReadOnly(false);
         emergencyCEmail.setReadOnly(false);
         upload.setVisible(true);
-        age.setVisible(false);
-        gender.setVisible(false);
-        status.setVisible(false);
-        ci.setVisible(false);
-        issuedIn.setVisible(false);
-        pTitle1.setVisible(false);
-        pTitle2.setVisible(false);
-        pTitle3.setVisible(false);
-        pStudy1.setVisible(false);
-        pStudy2.setVisible(false);
-        pStudy3.setVisible(false);
-        certification1.setVisible(false);
-        certification2.setVisible(false);
-        certification3.setVisible(false);
-        certification4.setVisible(false);
-        recognition.setVisible(false);
-        achievements.setVisible(false);
-        language.setVisible(false);
-        languageLevel.setVisible(false);
-        cod.setVisible(false);
-        leadManager.setVisible(false);
-        project.setVisible(false);
-        dateOfEntry.setVisible(false);
-        dateOfExit.setVisible(false);
-        contractType.setVisible(false);
-        seniority.setVisible(false);
-        salary.setVisible(false);
-        bankName.setVisible(false);
-        accountNumber.setVisible(false);
-        gpss.setVisible(false);
-        sss.setVisible(false);
-        beneficiaries.setVisible(false);
+        age.setReadOnly(false);
+        gender.setReadOnly(false);
+        status.setReadOnly(false);
+        ci.setReadOnly(false);
+        issuedIn.setReadOnly(false);
+        pTitle1.setReadOnly(false);
+        pTitle2.setReadOnly(false);
+        pTitle3.setReadOnly(false);
+        pStudy1.setReadOnly(false);
+        pStudy2.setReadOnly(false);
+        pStudy3.setReadOnly(false);
+        certification1.setReadOnly(false);
+        certification2.setReadOnly(false);
+        certification3.setReadOnly(false);
+        certification4.setReadOnly(false);
+        recognition.setReadOnly(false);
+        achievements.setReadOnly(false);
+        language.setReadOnly(false);
+        languageLevel.setReadOnly(false);
+        cod.setReadOnly(false);
+        leadManager.setReadOnly(false);
+        project.setReadOnly(false);
+        dateOfEntry.setReadOnly(false);
+        dateOfExit.setReadOnly(false);
+        contractType.setReadOnly(false);
+        seniority.setReadOnly(false);
+        salary.setReadOnly(false);
+        bankName.setReadOnly(false);
+        accountNumber.setReadOnly(false);
+        gpss.setReadOnly(false);
+        sss.setReadOnly(false);
+        beneficiaries.setReadOnly(false);
     }
 
     @Override
     protected List<Component> getFormComponents() {
         return List.of(
+                username,
                 infoPer,
                 infoGenr,
                 upload, profileImagePreview,