diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue
index cb357619..28e1f6f7 100644
--- a/src/pages/01_branch-management/MainPage.vue
+++ b/src/pages/01_branch-management/MainPage.vue
@@ -409,6 +409,12 @@ function openDialog() {
   modal.value = true;
 }
 
+watch(treeData, () => {
+  if (currentSubBranch.value !== undefined) {
+    selectedSubBranche(currentHq.value.id);
+  }
+});
+
 async function selectedSubBranche(id: string) {
   const res = await branchStore.fetchById(id, {
     includeSubBranch: true,
@@ -632,7 +638,7 @@ async function triggerEdit(
   currentBranchAdmin.value = branchAdmin;
 }
 
-function triggerDelete(id: string) {
+async function triggerDelete(id: string) {
   if (id) {
     dialog({
       color: 'negative',
@@ -642,23 +648,29 @@ function triggerDelete(id: string) {
       persistent: true,
       message: t('dialog.message.confirmDelete'),
       action: async () => {
-        await branchStore.deleteById(id);
-        await fetchList({ tree: true, pageSize: 99999 });
-        modalDrawer.value = false;
-        await calculateStats();
+        const res = await branchStore.deleteById(id);
 
-        const branchLength = treeData.value.find(
-          (node) => node.id === expandedTree.value[0],
-        )?.branch.length;
-        if (branchLength === 0) {
-          expandedTree.value = [];
-          fieldSelectedBranch.value.value = 'branchHQLabel';
-          currentHq.value = {
-            id: '',
-            code: '',
-          };
+        console.log(res);
+
+        if (res) {
+          await fetchList({ tree: true, pageSize: 99999 });
+          modalDrawer.value = false;
+          modal.value = false;
+          await calculateStats();
+
+          const branchLength = treeData.value.find(
+            (node) => node.id === expandedTree.value[0],
+          )?.branch.length;
+          if (branchLength === 0) {
+            expandedTree.value = [];
+            fieldSelectedBranch.value.value = 'branchHQLabel';
+            currentHq.value = {
+              id: '',
+              code: '',
+            };
+          }
+          flowStore.rotate();
         }
-        flowStore.rotate();
       },
       cancel: () => {},
     });
@@ -745,8 +757,8 @@ async function triggerChangeStatus(
 }
 
 async function onSubmit(submitSelectedItem?: boolean) {
+  delete formData.value['codeHeadOffice'];
   if (formType.value === 'edit' || submitSelectedItem) {
-    delete formData.value['codeHeadOffice'];
     delete formData.value['code'];
 
     const res = await branchStore.editById(
@@ -773,6 +785,11 @@ async function onSubmit(submitSelectedItem?: boolean) {
   }
 
   if (formType.value === 'create') {
+    if (formData.value.headOfficeId !== undefined) {
+      formData.value.code = formData.value?.code?.slice(0, -5);
+      formData.value.codeHeadOffice = formData.value?.codeHeadOffice?.slice(-5);
+    }
+
     const createBranch = async () => {
       const res = await branchStore.create(
         {
@@ -1796,7 +1813,11 @@ watch(currentHq, () => {
               v-if="formType !== 'edit' && !!currentId"
               id="btn-info-basic-delete"
               icon-only
-              @click="triggerDelete(currentEdit.id)"
+              @click="
+                () => {
+                  triggerDelete(currentEdit.id);
+                }
+              "
               type="button"
             />
           </div>