diff --git a/client/core/src/lib/app.js b/client/core/src/lib/app.js
index 5b3d0b3e68..07822682ae 100644
--- a/client/core/src/lib/app.js
+++ b/client/core/src/lib/app.js
@@ -17,7 +17,7 @@ export default class App {
     }
     showError(message) {
         if (this.snackbar)
-            this.snackbar.showError({message: `Error: ${message}`});
+            this.snackbar.showError({message: message});
     }
     pushLoader() {
         this.loaderStatus++;
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index f8d40228b9..1c74db7fd1 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -62,6 +62,7 @@ export default {
         activeCheckboxLabel: `vn-check[label="Active"] > label`,
         frozenCheckboxLabel: `vn-check[label="Frozen"] > label`,
         invoiceByAddressCheckboxInput: `vn-check[label='Invoice by address'] > label > input`,
+        verifiedDataCheckbox: `vn-check[label="Verified data"] > label`,
         verifiedDataCheckboxInput: `vn-check[label="Verified data"] > label > input`,
         hasToInvoiceCheckboxLabel: `vn-check[label='Has to invoice'] > label`,
         invoiceByMailCheckboxLabel: `vn-check[label='Invoice by mail'] > label`,
diff --git a/e2e/paths/client-module/04_edit_pay_method.spec.js b/e2e/paths/client-module/04_edit_pay_method.spec.js
index 0520fd1275..cc084d802e 100644
--- a/e2e/paths/client-module/04_edit_pay_method.spec.js
+++ b/e2e/paths/client-module/04_edit_pay_method.spec.js
@@ -58,7 +58,7 @@ describe('Client', () => {
             .waitToClick(selectors.clientPayMethod.saveButton)
             .waitForSnackbar()
             .then(result => {
-                expect(result).toContain('Error');
+                expect(result).toContain('requires an IBAN');
             });
         });
 
diff --git a/e2e/paths/client-module/05_add_address.spec.js b/e2e/paths/client-module/05_add_address.spec.js
index 1855dba3bf..8ab306fb05 100644
--- a/e2e/paths/client-module/05_add_address.spec.js
+++ b/e2e/paths/client-module/05_add_address.spec.js
@@ -143,7 +143,7 @@ describe('Client', () => {
             .waitToClick(selectors.clientAddresses.saveButton)
             .waitForSnackbar()
             .then(result => {
-                expect(result).toContain('Error:');
+                expect(result).toContain('The default consignee can not be unchecked');
             });
         });
     });
diff --git a/e2e/paths/client-module/12_lock_of_verified_data.spec.js b/e2e/paths/client-module/12_lock_of_verified_data.spec.js
index 9e6a49d7ff..4515e70234 100644
--- a/e2e/paths/client-module/12_lock_of_verified_data.spec.js
+++ b/e2e/paths/client-module/12_lock_of_verified_data.spec.js
@@ -63,7 +63,7 @@ describe('Client', () => {
                 .evaluate(selector => {
                     console.log(document.querySelector(selector));
                     return document.querySelector(selector).className;
-                }, 'vn-client-fiscal-data > form > vn-card > div > vn-horizontal:nth-child(5) > vn-check:nth-child(4) > label')
+                }, selectors.clientFiscalData.verifiedDataCheckbox)
                 .then(result => {
                     expect(result).toContain('is-disabled');
                 });
@@ -152,7 +152,7 @@ describe('Client', () => {
                 .wait(selectors.clientFiscalData.verifiedDataCheckboxInput)
                 .evaluate(selector => {
                     return document.querySelector(selector).className;
-                }, 'vn-client-fiscal-data > form > vn-card > div > vn-horizontal:nth-child(5) > vn-check:nth-child(3) > label')
+                }, selectors.clientFiscalData.verifiedDataCheckbox)
                 .then(result => {
                     expect(result).not.toContain('is-disabled');
                 });
@@ -265,7 +265,7 @@ describe('Client', () => {
                 .wait(selectors.clientFiscalData.verifiedDataCheckboxInput)
                 .evaluate(selector => {
                     return document.querySelector(selector).className;
-                }, 'vn-client-fiscal-data > form > vn-card > div > vn-horizontal:nth-child(5) > vn-check:nth-child(3) > label')
+                }, selectors.clientFiscalData.verifiedDataCheckbox)
                 .then(result => {
                     expect(result).toContain('is-disabled');
                 });
@@ -341,7 +341,7 @@ describe('Client', () => {
                 .wait(selectors.clientFiscalData.verifiedDataCheckboxInput)
                 .evaluate(selector => {
                     return document.querySelector(selector).className;
-                }, 'vn-client-fiscal-data > form > vn-card > div > vn-horizontal:nth-child(5) > vn-check:nth-child(3) > label')
+                }, selectors.clientFiscalData.verifiedDataCheckbox)
                 .then(result => {
                     expect(result).not.toContain('is-disabled');
                 });
@@ -454,7 +454,7 @@ describe('Client', () => {
                 .wait(selectors.clientFiscalData.verifiedDataCheckboxInput)
                 .evaluate(selector => {
                     return document.querySelector(selector).className;
-                }, 'vn-client-fiscal-data > form > vn-card > div > vn-horizontal:nth-child(5) > vn-check:nth-child(4) > label')
+                }, selectors.clientFiscalData.verifiedDataCheckbox)
                 .then(result => {
                     expect(result).toContain('is-disabled');
                 });