diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index 35fae14ef..b03829835 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -84,6 +84,16 @@ const menuList = readonly<any[]>([
         label: "ข้อมูลเครื่องราชอิสริยาภรณ์",
         path: "masterInsignia",
       },
+    ],
+  },
+  {
+    key: 2,
+    icon: "o_person",
+    activeIcon: "person",
+    label: "ข้อมูลการประเมิน",
+    path: "metadataNew",
+    role: "evaluateKPI",
+    children: [
       {
         key: 2.1,
         label: "ตัวชี้วัด",
@@ -120,6 +130,14 @@ const menuList = readonly<any[]>([
       },
     ],
   },
+  {
+    key: 3,
+    icon: "mdi-account-badge",
+    activeIcon: "groups",
+    label: "จัดการผู้ใช้งานและสิทธิ์",
+    role: "user_role",
+    path: "manageUser",
+  },
   {
     key: 3,
     icon: "o_groups",
diff --git a/src/modules/14_KPI/components/Tab/TabMain.vue b/src/modules/14_KPI/components/Tab/TabMain.vue
index daa95ee63..645a44c3f 100644
--- a/src/modules/14_KPI/components/Tab/TabMain.vue
+++ b/src/modules/14_KPI/components/Tab/TabMain.vue
@@ -88,9 +88,8 @@ const splitterModel = ref<number>(12);
           class="q-pa-none"
         >
           <Assessment v-if="store.tabMain === '1'" />
-          <Assessment v-if="store.tabMain === '2'" :type="'evaluator'" />
-          <Assessment v-if="store.tabMain === '3'" :type="'commander'" />
-          <Assessment v-if="store.tabMain === '4'" :type="'commanderHigh'" />
+          <Assessment v-if="store.tabMain === '2'" />
+          <Assessment v-if="store.tabMain === '3'" />
           <File v-if="store.tabMain === '5'" />
         </q-tab-panel>
       </q-tab-panels>