diff --git a/src/pages/09_task-order/MainPage.vue b/src/pages/09_task-order/MainPage.vue
index 30bab6c2..5576d3d0 100644
--- a/src/pages/09_task-order/MainPage.vue
+++ b/src/pages/09_task-order/MainPage.vue
@@ -173,7 +173,7 @@ watch(
 </script>
 <template>
   <FloatingActionButton
-    v-if="canAccess('taskOrder', 'edit')"
+    v-if="canAccess('taskOrder', 'edit') || pageState.isMessenger"
     style="z-index: 999"
     :hide-icon="!pageState.isMessenger"
     @click.stop="
diff --git a/src/pages/09_task-order/TableEmployee.vue b/src/pages/09_task-order/TableEmployee.vue
index e8b931cc..e0fd0207 100644
--- a/src/pages/09_task-order/TableEmployee.vue
+++ b/src/pages/09_task-order/TableEmployee.vue
@@ -79,7 +79,7 @@ function getEmployeeName(
   return (
     {
       ['eng']: `${useOptionStore().mapOption(employee?.namePrefix || '')} ${employee?.firstNameEN} ${employee?.lastNameEN}`,
-      ['tha']: `${useOptionStore().mapOption(employee?.namePrefix || '')} ${employee?.firstName} ${employee?.lastName}`,
+      ['tha']: `${useOptionStore().mapOption(employee?.namePrefix || '')} ${employee?.firstName || employee?.firstNameEN} ${employee?.lastName}`,
     }[opts?.locale || 'eng'] || '-'
   );
 }
diff --git a/src/pages/09_task-order/order_view/MainPage.vue b/src/pages/09_task-order/order_view/MainPage.vue
index 8d459fc8..2debeebb 100644
--- a/src/pages/09_task-order/order_view/MainPage.vue
+++ b/src/pages/09_task-order/order_view/MainPage.vue
@@ -4,7 +4,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { api } from 'src/boot/axios';
 import { Lang } from 'src/utils/ui';
-import { baseUrl } from 'stores/utils';
+import { baseUrl, canAccess } from 'stores/utils';
 
 import TaskStatusComponent from '../TaskStatusComponent.vue';
 import StateButton from 'src/components/button/StateButton.vue';
@@ -1010,7 +1010,6 @@ watch(
             "
           />
           <!-- TODO: blind remark, urgent -->
-          {{ console.log(taskListGroup) }}
           <RemarkExpansion
             v-if="
               view === TaskOrderStatus.Pending ||
@@ -1176,7 +1175,10 @@ watch(
                           <template #append="{ props: subProps }">
                             <TaskStatusComponent
                               :key="subProps.row.id"
-                              :no-action="view !== TaskOrderStatus.Validate"
+                              :no-action="
+                                view !== TaskOrderStatus.Validate &&
+                                !canAccess('taskOrder', 'edit')
+                              "
                               type="order"
                               :readonly="
                                 (() => {