diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index f44e9dadf6..96b782e44e 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -106,6 +106,7 @@ const originalData = ref({});
 const formData = computed(() => state.get(modelValue));
 const defaultButtons = computed(() => ({
     save: {
+        dataCy: 'saveDefaultBtn',
         color: 'primary',
         icon: 'save',
         label: 'globals.save',
@@ -113,6 +114,7 @@ const defaultButtons = computed(() => ({
         type: 'submit',
     },
     reset: {
+        dataCy: 'resetDefaultBtn',
         color: 'primary',
         icon: 'restart_alt',
         label: 'globals.reset',
@@ -318,6 +320,7 @@ defineExpose({
                 :title="t(defaultButtons.reset.label)"
             />
             <QBtnDropdown
+                data-cy="saveAndContinueDefaultBtn"
                 v-if="$props.goTo"
                 @click="saveAndGo"
                 :label="tMobile('globals.saveAndContinue')"
diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index b395b39340..1aebe83e47 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -105,6 +105,7 @@ onBeforeRouteLeave((to, from, next) => {
                             @click="insert"
                             class="q-mb-xs"
                             dense
+                            data-cy="saveNote"
                         />
                     </template>
                 </VnInput>
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index dd71edc0bf..622044bbd8 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -51,7 +51,12 @@ function onBeforeSave(formData, originalData) {
         @on-fetch="(data) => (businessTypes = data)"
         auto-load
     />
-    <FormModel auto-load model="customer" :mapper="onBeforeSave">
+    <FormModel
+        :url="`Clients/${route.params.id}`"
+        auto-load
+        model="customer"
+        :mapper="onBeforeSave"
+    >
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
diff --git a/src/pages/Customer/Card/CustomerWebPayment.vue b/src/pages/Customer/Card/CustomerWebPayment.vue
index df6f39bca8..0e2e690cc1 100644
--- a/src/pages/Customer/Card/CustomerWebPayment.vue
+++ b/src/pages/Customer/Card/CustomerWebPayment.vue
@@ -7,8 +7,8 @@ import FetchData from 'src/components/FetchData.vue';
 
 import { toCurrency, toDateHourMin } from 'src/filters';
 
-import CustomerCloseIconTooltip from 'src/components/CustomerCloseIconTooltip.vue';
-import CustomerCheckIconTooltip from 'src/components/CustomerCheckIconTooltip.vue';
+import CustomerCloseIconTooltip from '../components/CustomerCloseIconTooltip.vue';
+import CustomerCheckIconTooltip from '../components/CustomerCheckIconTooltip.vue';
 
 const { t } = useI18n();
 const route = useRoute();