diff --git a/src/components/04_flow-management/FormFlow.vue b/src/components/04_flow-management/FormFlow.vue
index ac28041d..ab2ed98f 100644
--- a/src/components/04_flow-management/FormFlow.vue
+++ b/src/components/04_flow-management/FormFlow.vue
@@ -16,9 +16,9 @@ import {
 import { User } from 'src/stores/user/types';
 
 import SelectMenuWithSearch from '../shared/SelectMenuWithSearch.vue';
-import SelectInput from '../shared/SelectInput.vue';
 import ToggleButton from 'src/components/button/ToggleButton.vue';
 import NoData from '../NoData.vue';
+import SelectBranch from '../shared/select/SelectBranch.vue';
 
 defineProps<{
   readonly?: boolean;
@@ -180,17 +180,14 @@ onMounted(async () => {
     </section>
 
     <section class="col-12 row q-col-gutter-sm">
-      <SelectInput
-        v-if="role.includes('system')"
-        :readonly
-        v-model="registerBranchId"
-        class="col-2"
-        :option="userStore.userOption.hqOpts"
+      <SelectBranch
         :label="$t('branch.form.code')"
-        :rules="[
-          (val: string) =>
-            (role.includes('system') && !!val) || $t('form.error.required'),
-        ]"
+        :readonly
+        code-only
+        v-model:value="registerBranchId"
+        v-if="role.includes('system')"
+        class="col-3"
+        required
       />
       <q-input
         :readonly