diff --git a/src/components/03_customer-management/employee/BasicInformation.vue b/src/components/03_customer-management/employee/BasicInformation.vue
index 26a1d0d5..b117b24d 100644
--- a/src/components/03_customer-management/employee/BasicInformation.vue
+++ b/src/components/03_customer-management/employee/BasicInformation.vue
@@ -91,7 +91,7 @@ onMounted(() => {
       <!-- v-if="!readonly" -->
       <div class="row">
         <UndoButton
-          v-if="!readonly"
+          v-if="!readonly && !showBtnSave"
           id="btn-info-basic-undo"
           icon-only
           @click="$emit('undo')"
@@ -105,14 +105,14 @@ onMounted(() => {
           type="button"
         />
         <EditButton
-          v-if="readonly"
+          v-if="readonly && !showBtnSave"
           id="btn-info-basic-edit"
           icon-only
           @click="$emit('edit')"
           type="button"
         />
         <DeleteButton
-          v-if="readonly"
+          v-if="readonly && !showBtnSave"
           id="btn-info-basic-delete"
           icon-only
           @click="$emit('delete')"
diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue
index 3096e02d..5449aced 100644
--- a/src/pages/03_customer-management/MainPage.vue
+++ b/src/pages/03_customer-management/MainPage.vue
@@ -2197,6 +2197,7 @@ watch(
         <BasicInformation
           id="form-information"
           prefix-id="form-employee"
+          showBtnSave
           employee
           dense
           outlined
@@ -2207,6 +2208,12 @@ watch(
           v-model:employee-id="employeeFormState.currentEmployeeCode"
           v-model:nrc-no="currentFromDataEmployee.nrcNo"
           v-model:code="currentFromDataEmployee.code"
+          @save="
+            async () => {
+              await employeeFormStore.submitPersonal();
+              await fetchListEmployee();
+            }
+          "
           @filter-owner-branch="employeeFormStore.employeeFilterOwnerBranch"
         />
         <FormPerson