diff --git a/src/pages/08_request-list/FormEmployee.vue b/src/pages/08_request-list/FormEmployee.vue
index 7f5531d1..3cdcc378 100644
--- a/src/pages/08_request-list/FormEmployee.vue
+++ b/src/pages/08_request-list/FormEmployee.vue
@@ -1,13 +1,19 @@
 <script setup lang="ts">
 import SelectUser from 'src/components/shared/select/SelectUser.vue';
+import { watch } from 'vue';
 
 const localEmployee = defineModel<boolean>('localEmployee', { required: true });
 const employeeId = defineModel<string>('employeeId', { required: false });
 
 defineProps<{
   readonly?: boolean;
+  districtId?: string;
   cost?: boolean;
 }>();
+
+watch(localEmployee, (lhs, rhs) => {
+  if (lhs && !rhs) employeeId.value = '';
+});
 </script>
 <template>
   <div class="row items-center q-px-md q-py-xs">
@@ -32,9 +38,13 @@ defineProps<{
 
     <div class="col-12 row">
       <SelectUser
+        :key="localEmployee.toString()"
         class="col-md-5 col-12"
         v-model:value="employeeId"
-        :params="{ userType: 'MESSENGER' }"
+        :params="{
+          userType: 'MESSENGER',
+          responsibleDistrictId: localEmployee ? districtId : undefined,
+        }"
         :readonly
         :label="$t('general.select', { msg: $t('personnel.MESSENGER') })"
       />
diff --git a/src/pages/08_request-list/FormExpansion.vue b/src/pages/08_request-list/FormExpansion.vue
index d289bcfe..a9a8e639 100644
--- a/src/pages/08_request-list/FormExpansion.vue
+++ b/src/pages/08_request-list/FormExpansion.vue
@@ -11,6 +11,7 @@ import { useRequestList } from 'src/stores/request-list';
 
 const props = defineProps<{
   step: Step;
+  responsibleAreaDistrictId?: string;
 }>();
 
 const requestListStore = useRequestList();
@@ -152,6 +153,7 @@ function assignToForm() {
           class="surface-1"
           v-model:local-employee="formData.localEmployee"
           v-model:employee-id="formData.employeeId"
+          :district-id="responsibleAreaDistrictId"
         />
       </section>
       <section class="col-12">
diff --git a/src/pages/08_request-list/RequestListView.vue b/src/pages/08_request-list/RequestListView.vue
index 09698b5d..9680a324 100644
--- a/src/pages/08_request-list/RequestListView.vue
+++ b/src/pages/08_request-list/RequestListView.vue
@@ -529,6 +529,9 @@ async function triggerViewFile(opt: {
                       value.stepStatus?.[pageState.currentStep - 1]?.attributes
                         ?.form
                     "
+                    :responsible-area-district-id="
+                      data.quotation.customerBranch.districtId
+                    "
                   />
                   <PropertiesExpansion
                     :id="value.id"