diff --git a/src/components/03_customer-management/TableEmpoloyee.vue b/src/components/03_customer-management/TableEmpoloyee.vue
index 61346e5a..cb156e44 100644
--- a/src/components/03_customer-management/TableEmpoloyee.vue
+++ b/src/components/03_customer-management/TableEmpoloyee.vue
@@ -364,4 +364,15 @@ defineEmits<{
     --_fg: var(--gender-female);
   }
 }
+
+.status-active {
+  --_branch-status-color: var(--green-6-hsl);
+}
+
+.status-inactive {
+  --_branch-status-color: var(--stone-5-hsl);
+  --_branch-badge-bg: var(--stone-5-hsl);
+  filter: grayscale(0.5);
+  opacity: 0.5;
+}
 </style>
diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue
index 878b67d9..72ac7d41 100644
--- a/src/pages/01_branch-management/MainPage.vue
+++ b/src/pages/01_branch-management/MainPage.vue
@@ -1811,7 +1811,7 @@ watch(currentHq, () => {
           style="position: absolute; z-index: 99999; top: 0; right: 0"
         >
           <div
-            v-if="formData.status !== 'INACTIVE'"
+            v-if="formData.status !== 'INACTIVE' || !currentId"
             class="surface-1 row rounded"
           >
             <UndoButton
diff --git a/src/pages/02_personnel-management/MainPage.vue b/src/pages/02_personnel-management/MainPage.vue
index 1ba2761f..27923d1d 100644
--- a/src/pages/02_personnel-management/MainPage.vue
+++ b/src/pages/02_personnel-management/MainPage.vue
@@ -318,6 +318,7 @@ function onClose(excludeDialog?: boolean) {
     infoDrawer.value = excludeDialog || false;
     return;
   }
+  modal.value = false;
   hqId.value = '';
   brId.value = '';
   userCode.value = '';
@@ -325,7 +326,6 @@ function onClose(excludeDialog?: boolean) {
   profileFileImg.value = null;
   infoDrawerEdit.value = false;
   agencyFile.value = [];
-  modal.value = false;
   isEdit.value = false;
   statusToggle.value = true;
   isImageEdit.value = false;
@@ -443,12 +443,6 @@ async function onSubmit(excludeDialog?: boolean) {
   } else {
     if (!hqId.value) return;
 
-    if (statusToggle.value) {
-      formData.value.status = 'CREATED';
-    } else {
-      formData.value.status = 'INACTIVE';
-    }
-
     formData.value.branchId = brId.value
       ? brId.value
       : hqId.value
@@ -1798,10 +1792,7 @@ watch(
             'q-py-sm q-px-lg': !$q.screen.gt.sm,
           }"
         >
-          <div
-            v-if="formData.status !== 'INACTIVE'"
-            class="surface-1 row rounded"
-          >
+          <div class="surface-1 row rounded">
             <SaveButton id="btn-info-basic-save" icon-only type="submit" />
           </div>
         </div>
diff --git a/src/pages/04_product-service/MainPage.vue b/src/pages/04_product-service/MainPage.vue
index b9c12a97..d452c046 100644
--- a/src/pages/04_product-service/MainPage.vue
+++ b/src/pages/04_product-service/MainPage.vue
@@ -1118,6 +1118,7 @@ async function submitService(notClose = false) {
     const res = await createService(
       {
         ...formDataProductService.value,
+
         workflowId: currWorkflow.value?.id || '',
       },
       onCreateImageList.value,
@@ -1197,7 +1198,11 @@ async function submitGroup() {
       await editProductGroup(currentIdGroupTree.value, formDataGroup.value);
     else await editProductGroup(currentIdGroup.value, formDataGroup.value);
   } else {
-    const res = await createProductGroup(formDataGroup.value);
+    const res = await createProductGroup({
+      ...formDataGroup.value,
+      status:
+        currentStatusGroupType.value === 'CREATED' ? undefined : 'INACTIVE',
+    });
 
     if (res) {
       allStat.value[0].count = allStat.value[0].count + 1;
diff --git a/src/stores/product-service/index.ts b/src/stores/product-service/index.ts
index 210177b8..ef12a196 100644
--- a/src/stores/product-service/index.ts
+++ b/src/stores/product-service/index.ts
@@ -164,7 +164,7 @@ const useProductServiceStore = defineStore('api-product-service', () => {
       list: { url: string; imgFile: File | null; name: string }[];
     },
   ) {
-    const { image, status, ...payload } = data;
+    const { image, ...payload } = data;
 
     const res = await api.post<ProductCreate>('/product', {
       ...payload,
@@ -271,7 +271,7 @@ const useProductServiceStore = defineStore('api-product-service', () => {
       list: { url: string; imgFile: File | null; name: string }[];
     },
   ) {
-    const { image, status, ...payload } = data;
+    const { image, ...payload } = data;
 
     const res = await api.post<ServiceCreate & { imageUploadUrl: string }>(
       '/service',
diff --git a/src/stores/product-service/types.ts b/src/stores/product-service/types.ts
index 0beb9d98..a7d794be 100644
--- a/src/stores/product-service/types.ts
+++ b/src/stores/product-service/types.ts
@@ -232,6 +232,7 @@ export interface ProductGroupCreate {
   code: string;
   shared?: boolean;
   registeredBranchId: string;
+  status?: Status;
 }
 
 export interface ProductGroupUpdate {