diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index bb9ebf4f2..175963ea8 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -897,7 +897,7 @@ onMounted(async () => {
                     v-if="
                       roleAdmin &&
                       props.row.draft === 'รอส่งตัว' &&
-                      props.row.statusId === 'PREPARE-CONTAIN'
+                      props.row.orgName !== null
                     "
                     clickable
                     v-close-popup
diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue
index 631f6574b..f9d8ef256 100644
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@@ -883,7 +883,7 @@ function removeFile(fileName: string) {
   <q-card bordered class="row col-12 text-dark q-mt-sm">
     <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
       <div class="q-pl-sm text-weight-bold text-dark">
-        ผลการพิจารณาของการเจ้าหน้าที่
+        ผลการพิจารณาของสำนักการเจ้าหน้าที่ (สกจ.)
       </div>
     </div>
     <q-separator />