diff --git a/e2e/helpers/extensions.js b/e2e/helpers/extensions.js
index fe3ef08bd..1cfba9600 100644
--- a/e2e/helpers/extensions.js
+++ b/e2e/helpers/extensions.js
@@ -625,6 +625,7 @@ let actions = {
 
         switch (tagName) {
         case 'vn-textfield':
+        case 'vn-account-number':
         case 'vn-datalist':
         case 'vn-input-number':
             await this.clearInput(selector);
@@ -666,6 +667,7 @@ let actions = {
 
         switch (tagName) {
         case 'vn-textfield':
+        case 'vn-account-number':
         case 'vn-autocomplete':
         case 'vn-input-time':
         case 'vn-datalist':
diff --git a/e2e/paths/13-supplier/03_fiscal_data.spec.js b/e2e/paths/13-supplier/03_fiscal_data.spec.js
index 891b769c9..48a667b64 100644
--- a/e2e/paths/13-supplier/03_fiscal_data.spec.js
+++ b/e2e/paths/13-supplier/03_fiscal_data.spec.js
@@ -52,6 +52,7 @@ describe('Supplier fiscal data path', () => {
         });
 
         await page.reloadSection('supplier.card.fiscalData');
+
         const formValues = await page.fetchForm(form, Object.keys(values));
 
         expect(errorMessage.text).toContain('Invalid Tax number');
diff --git a/modules/client/front/balance/create/index.html b/modules/client/front/balance/create/index.html
index 63129882e..058cda479 100644
--- a/modules/client/front/balance/create/index.html
+++ b/modules/client/front/balance/create/index.html
@@ -55,7 +55,10 @@
     <vn-vertical ng-show="$ctrl.bankSelection.accountingType.code == 'compensation'">
         <h6 translate>Compensation</h6>
         <vn-account-number
-            account-number="$ctrl.receipt.compensationAccount">
+            vn-one
+            label="Compensation Account"
+            vn-name="compensationAccount"
+            ng-model="$ctrl.receipt.compensationAccount">
         </vn-account-number>
     </vn-vertical>
     <vn-horizontal>
diff --git a/modules/client/front/balance/create/index.js b/modules/client/front/balance/create/index.js
index 62b942ca3..19a52bb6d 100644
--- a/modules/client/front/balance/create/index.js
+++ b/modules/client/front/balance/create/index.js
@@ -7,7 +7,6 @@ class Controller extends Dialog {
         this.vnReport = vnReport;
         this.vnEmail = vnEmail;
         this.receipt = {};
-        $.$on('accountShortToStandard', (event, value) => this.getClientOrSupplierReference(value));
     }
 
     set payed(value) {
diff --git a/modules/supplier/front/fiscal-data/index.html b/modules/supplier/front/fiscal-data/index.html
index c016238b3..3fe60a99a 100644
--- a/modules/supplier/front/fiscal-data/index.html
+++ b/modules/supplier/front/fiscal-data/index.html
@@ -61,7 +61,7 @@
             <vn-account-number
                 vn-one
                 label="Account"
-                name="account"
+                vn-name="account"
                 ng-model="$ctrl.supplier.account">
             </vn-account-number>
             <vn-autocomplete