diff --git a/src/components/03_customer-management/BasicInformation.vue b/src/components/03_customer-management/BasicInformation.vue
index 91ac3f8f..2b16f199 100644
--- a/src/components/03_customer-management/BasicInformation.vue
+++ b/src/components/03_customer-management/BasicInformation.vue
@@ -23,7 +23,7 @@ const customerBranch = defineModel<{
 const employeeId = defineModel<string>('employeeId');
 const nrcNo = defineModel<string>('nrcNo');
 
-defineProps<{
+const props = defineProps<{
   dense?: boolean;
   outlined?: boolean;
   readonly?: boolean;
@@ -39,14 +39,24 @@ defineEmits<{
   (e: 'filterOwnerBranch', val: string, update: void): void;
 }>();
 
-onMounted(async () => {});
+onMounted(async () => {
+
+  if(!!props.optionsBranch) {
+
+    registeredBranchId.value = props.optionsBranch[0].id ;
+  }
+
+});
 </script>
 
 <template>
+
+  
   <div class="col-3 app-text-muted">
     • {{ $t(`formDialogTitleInformation`) }}
   </div>
   <div v-if="!employee" class="col-9 row q-col-gutter-md">
+
     <q-select
       id="input-source-nationality"
       :dense="dense"
diff --git a/src/components/04_product-service/BasicInfoProduct.vue b/src/components/04_product-service/BasicInfoProduct.vue
index 032e3e89..d75c9f7d 100644
--- a/src/components/04_product-service/BasicInfoProduct.vue
+++ b/src/components/04_product-service/BasicInfoProduct.vue
@@ -10,9 +10,9 @@ const name = defineModel<string>('name');
 const code = defineModel<string>('code');
 
 const registeredBranchId = defineModel<string>('registeredBranchId');
-const codeOption = ref([]);
+const codeOption = ref<{ id: string; name: string }[]>([]);
 
-defineProps<{
+const props = defineProps<{
   dense?: boolean;
   outlined?: boolean;
   readonly?: boolean;
@@ -31,6 +31,15 @@ onMounted(async () => {
   if (locale.value === 'th-th') {
     codeOption.value = option.tha.typeProduct;
   }
+
+  if(!!props.optionsBranch) {
+
+  
+
+    registeredBranchId.value = props.optionsBranch[0].id ;
+  }
+
+
 });
 </script>
 
diff --git a/src/components/04_product-service/BasicInformation.vue b/src/components/04_product-service/BasicInformation.vue
index e4d86d61..c26704d9 100644
--- a/src/components/04_product-service/BasicInformation.vue
+++ b/src/components/04_product-service/BasicInformation.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import useOptionStore from 'src/stores/options';
+import { onMounted } from 'vue';
 
 const optionStore = useOptionStore();
 
@@ -13,7 +14,7 @@ const serviceName = defineModel<string>('serviceNameTh');
 const serviceDescription = defineModel<string>('serviceDescription');
 
 const registeredBranchId = defineModel<string | null>('registeredBranchId');
-defineProps<{
+const props = defineProps<{
   dense?: boolean;
   outlined?: boolean;
   readonly?: boolean;
@@ -22,6 +23,14 @@ defineProps<{
   service?: boolean;
   optionsBranch?: { id: string; name: string }[];
 }>();
+
+onMounted(async () => {
+  if(!!props.optionsBranch) {
+    registeredBranchId.value = props.optionsBranch[0].id ;
+  }
+});
+
+
 </script>
 
 <template>