diff --git a/src/modules/02_organizationalNew/components/DialogFormAgency.vue b/src/modules/02_organizationalNew/components/DialogFormAgency.vue
index b12cfcff2..5859b367a 100644
--- a/src/modules/02_organizationalNew/components/DialogFormAgency.vue
+++ b/src/modules/02_organizationalNew/components/DialogFormAgency.vue
@@ -61,10 +61,7 @@ const orgLevelOptionMain = ref<DataOption[]>([
   { name: "ระดับฝ่าย/กลุ่มงาน", id: "SECTION" },
 ]);
 
-const orgLevelSubOptionMain = ref<DataOption[]>([
-  { name: "สำนัก/สำนักงาน", id: "OFFICER" },
-  { name: "สำนักงานเขต", id: "DISTRICT" },
-]);
+const orgLevelSubOptionMain = ref<DataOption[]>([]);
 
 const orgLevelOption = ref<DataOption[]>([]);
 
@@ -240,6 +237,8 @@ watch(
           orgLevelOption.value = orgLevelOptionMain.value.slice(1, 4);
           formData.orgLevel = "";
         }
+
+        formData.orgLevel == "DEPARTMENT" ? selectOrgLevele("DEPARTMENT") : "";
       } else {
         if (props.dataNode) {
           formData.orgName = props.dataNode.orgTreeName;
@@ -278,7 +277,8 @@ function selectOrgLevele(val: string, status: boolean = true) {
   switch (val) {
     case "DEPARTMENT":
       orgLevelSubOptionMain.value = [
-        { name: "สำนัก/สำนักงาน", id: "OFFICER" },
+        { name: "สำนัก", id: "BUREAU" },
+        { name: "สำนักงาน", id: "OFFICE" },
         { name: "สำนักงานเขต", id: "DISTRICT" },
       ];
       break;