diff --git a/base/forms.py b/base/forms.py
index c0321f1f7..ca76e97ee 100644
--- a/base/forms.py
+++ b/base/forms.py
@@ -1439,16 +1439,7 @@ class EmployeeShiftScheduleForm(ModelForm):
         """
 
         model = EmployeeShiftSchedule
-        fields = [
-            "shift_id",
-            "minimum_working_hour",
-            "start_time",
-            "end_time",
-            "is_auto_punch_out_enabled",
-            "auto_punch_out_time",
-            "company_id",
-            "day",
-        ]
+        fields = "__all__"
         exclude = ["is_active", "day", "is_night_shift"]
         widgets = {
             "start_time": forms.TimeInput(),
diff --git a/employee/templates/tabs/personal_tab.html b/employee/templates/tabs/personal_tab.html
index 30fab7553..74248e671 100644
--- a/employee/templates/tabs/personal_tab.html
+++ b/employee/templates/tabs/personal_tab.html
@@ -23,7 +23,7 @@
 							<ion-icon name="transgender-outline"></ion-icon>
 							<span>{% trans "Gender" %}</span>
 						</span>
-						<span class="oh-profile__info-value">{% trans employee.get_gender_display %}</span>
+						<span class="oh-profile__info-value">{{employee.get_gender_display}}</span>
 					</li>
 
 					<li class="oh-profile__card-info-item">