diff --git a/src/pages/03_customer-management/BranchPage.vue b/src/pages/03_customer-management/BranchPage.vue
index a2f3656a..9bcb0369 100644
--- a/src/pages/03_customer-management/BranchPage.vue
+++ b/src/pages/03_customer-management/BranchPage.vue
@@ -779,11 +779,15 @@ watch(
             </div>
           </div>
           <EmployerFormAbout
+            prefixId="dialog"
             :readonly="customerBranchFormState.dialogType === 'info'"
             class="q-mb-xl"
             :index="
-              customerBranchFormData.code &&
-              Number(customerBranchFormData.code.split('-').pop()).toString()
+              (customerBranchFormData.code &&
+                Number(
+                  customerBranchFormData.code.split('-').pop(),
+                ).toString()) ||
+              ''
             "
             :customer-type="customerType"
             v-model:citizen-id="customerBranchFormData.citizenId"
@@ -911,6 +915,7 @@ watch(
             </div>
           </div>
           <EmployerFormContact
+            prefixId="dialog"
             class="q-mb-lg"
             :readonly="customerBranchFormState.dialogType === 'info'"
             v-model:contact-name="customerBranchFormData.contactName"
diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue
index 35d4b24a..e43c8891 100644
--- a/src/pages/03_customer-management/MainPage.vue
+++ b/src/pages/03_customer-management/MainPage.vue
@@ -1148,7 +1148,7 @@ const emptyCreateDialog = ref(false);
                           'status-active': props.row.status !== 'INACTIVE',
                           'status-inactive': props.row.status === 'INACTIVE',
                         }"
-                        :id="`row-table-${props.row.customerName}`"
+                        :id="`row-table-${props.row.id}`"
                         :props="props"
                         @click="
                           $router.push(