diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue
index a39ced9b2..c20ede68f 100644
--- a/src/components/Dialogs/PopupPersonalNew.vue
+++ b/src/components/Dialogs/PopupPersonalNew.vue
@@ -102,7 +102,7 @@ async function fetchInformation(id: string) {
     .get(
       config.API.orgProfileById(
         id,
-        `${props.type == "employee" ? `-${props.type}` : ""}`
+        `${props.type.toLocaleLowerCase() == "employee" ? `-${props.type.toLocaleLowerCase()}` : ""}`
       )
     )
     .then(async (res) => {
@@ -146,7 +146,7 @@ async function fetchProfileGov(id: string) {
     .get(
       config.API.profileNewGovernmentCard(
         id,
-        `${props.type == "employee" ? `-${props.type}` : ""}`
+        `${props.type.toLocaleLowerCase() == "employee" ? `-${props.type.toLocaleLowerCase()}` : ""}`
       )
     )
     .then(async (res) => {
@@ -222,7 +222,7 @@ async function fetchProfile(id: string, avatarName: string) {
     <q-card style="width: 420px; overflow: visible">
       <q-toolbar>
         <q-toolbar-title class="text-subtitle1 text-bold"
-          >ทะเบียนประวัติ
+          >ทะเบียนประวัติ{{ props.type }}
         </q-toolbar-title>
         <q-btn
           icon="close"
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index 7041e5a16..adf66d0e3 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -1803,7 +1803,7 @@ onMounted(async () => {
     :modal="modalPersonal"
     :id="personId"
     @update:modal="updatemodalPersonal"
-    v-model:is-employee="isEmpType"
+    :type="isEmpType"
   />
 </template>
 
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index f908d32ed..3738739db 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -2028,7 +2028,7 @@ onMounted(async () => {
     :modal="modalPersonal"
     :id="personId"
     @update:modal="updatemodalPersonal"
-    v-model:is-employee="isEmpType"
+    :type="isEmpType"
   />
 </template>
 
diff --git a/src/modules/11_discipline/components/4_Result/Form.vue b/src/modules/11_discipline/components/4_Result/Form.vue
index cc95b1691..c460cad2e 100644
--- a/src/modules/11_discipline/components/4_Result/Form.vue
+++ b/src/modules/11_discipline/components/4_Result/Form.vue
@@ -654,7 +654,7 @@ watch(
   <PopupPersonal
     :modal="modalPersonal"
     :id="personId"
-    v-model:is-employee="isEmpType"
+    :type="isEmpType"
     @update:modal="updatemodalPersonal"
   />