diff --git a/src/pages/08_request-list/MessengerExpansion.vue b/src/pages/08_request-list/MessengerExpansion.vue
index 30e81598..b883afee 100644
--- a/src/pages/08_request-list/MessengerExpansion.vue
+++ b/src/pages/08_request-list/MessengerExpansion.vue
@@ -86,7 +86,11 @@ function assignToForm() {
       customerDutyCost: attributesForm.value.customerDutyCost ?? 30,
       companyDuty: attributesForm.value.companyDuty ?? false,
       companyDutyCost: attributesForm.value.companyDutyCost ?? 30,
-      responsibleUserLocal: attributesForm.value.responsibleUserLocal ?? true,
+      responsibleUserLocal: attributesForm.value.responsibleUserLocal
+        ? attributesForm.value.responsibleUserLocal
+        : props.responsibleAreaDistrictId
+          ? false
+          : true,
       responsibleUserId:
         attributesForm.value.responsibleUserId || props.defaultMessenger,
       individualDuty: attributesForm.value.individualDuty ?? false,
diff --git a/src/pages/08_request-list/RequestListView.vue b/src/pages/08_request-list/RequestListView.vue
index 8b784175..6800cf27 100644
--- a/src/pages/08_request-list/RequestListView.vue
+++ b/src/pages/08_request-list/RequestListView.vue
@@ -867,7 +867,7 @@ function toEmployee(employee: RequestData['employee']) {
                       requestWorkId: value.id || '',
                     },
                     value.stepStatus?.[pageState.currentStep - 1]
-                      ?.responsibleUserId,
+                      ?.responsibleUserId ?? data.defaultMessengerId,
                   );
                 }
               "
diff --git a/src/pages/09_task-order/MainPage.vue b/src/pages/09_task-order/MainPage.vue
index a6b654d7..30bab6c2 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('related', 'edit')"
+    v-if="canAccess('taskOrder', 'edit')"
     style="z-index: 999"
     :hide-icon="!pageState.isMessenger"
     @click.stop="
diff --git a/src/stores/utils/index.ts b/src/stores/utils/index.ts
index 290aae02..8214bb27 100644
--- a/src/stores/utils/index.ts
+++ b/src/stores/utils/index.ts
@@ -278,6 +278,10 @@ const permissions = {
     edit: allRoles.slice(0, 9).filter((r) => r !== 'branch_accountant'),
     view: allRoles.slice(0, 9),
   },
+  taskOrder: {
+    edit: [...allRoles.slice(0, 6), 'data_entry'],
+    view: allRoles,
+  },
   related: {
     // ใช้กับหลายเมนู
     edit: allRoles.slice(0, 6),