diff --git a/src/components/04_product-service/BasicInfoProduct.vue b/src/components/04_product-service/BasicInfoProduct.vue
index d75c9f7d..73b1dc65 100644
--- a/src/components/04_product-service/BasicInfoProduct.vue
+++ b/src/components/04_product-service/BasicInfoProduct.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { getRole } from 'src/services/keycloak';
 import { ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 const { locale } = useI18n({ useScope: 'global' });
@@ -85,7 +86,13 @@ onMounted(async () => {
       option-value="id"
       v-model="registeredBranchId"
       :options="optionsBranch"
-      :rules="[(val) => !!val]"
+      :rules="[
+  (val) => {
+    const roles = getRole() || [];
+    const isSpecialRole = ['admin', 'system', 'head_of_admin'].some(role => roles.includes(role));
+    return isSpecialRole || !!val || 'กรุณากรอกข้อมูล';
+  }
+]"
     />
 
     <q-input
diff --git a/src/components/04_product-service/BasicInformation.vue b/src/components/04_product-service/BasicInformation.vue
index 22c479be..dba84f46 100644
--- a/src/components/04_product-service/BasicInformation.vue
+++ b/src/components/04_product-service/BasicInformation.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { getRole } from 'src/services/keycloak';
 import useOptionStore from 'src/stores/options';
 import { onMounted } from 'vue';
 
@@ -109,7 +110,13 @@ onMounted(  async() => {
       option-value="id"
       v-model="registeredBranchId"
       :options="optionsBranch"
-      :rules="[(val) => !!val]"
+      :rules="[
+  (val) => {
+    const roles = getRole() || [];
+    const isSpecialRole = ['admin', 'system', 'head_of_admin'].some(role => roles.includes(role));
+    return isSpecialRole || !!val || 'กรุณากรอกข้อมูล';
+  }
+]"
     />
 
     <q-input