diff --git a/front/core/components/autocomplete/autocomplete.html b/front/core/components/autocomplete/autocomplete.html
index ecb21fe2f1..c616c794af 100755
--- a/front/core/components/autocomplete/autocomplete.html
+++ b/front/core/components/autocomplete/autocomplete.html
@@ -14,7 +14,10 @@
                 translate-attr="{title: 'Clear'}">
             </vn-icon>
         </div>
-        <label class="mdl-textfield__label" translate>{{::$ctrl.label}}</label>
+        <label class="mdl-textfield__label">
+            <span translate>{{::$ctrl.label}}</span>
+            <span translate ng-show="::$ctrl.required">(*)</span>
+        </label> 
     </div>
 </div>
 <vn-drop-down
diff --git a/front/core/components/autocomplete/autocomplete.js b/front/core/components/autocomplete/autocomplete.js
index e9e2de374e..dc24aecf8a 100755
--- a/front/core/components/autocomplete/autocomplete.js
+++ b/front/core/components/autocomplete/autocomplete.js
@@ -294,6 +294,7 @@ ngModule.component('vnAutocomplete', {
         label: '@',
         field: '=?',
         disabled: '<?',
+        required: '@?',
         showField: '@?',
         valueField: '@?',
         initialData: '<?',
diff --git a/front/core/components/autocomplete/style.scss b/front/core/components/autocomplete/style.scss
index 6b43002888..c283ee09d4 100755
--- a/front/core/components/autocomplete/style.scss
+++ b/front/core/components/autocomplete/style.scss
@@ -37,6 +37,10 @@ vn-autocomplete {
             display: block;
         }
     }
+
+    label span:nth-child(2) {
+        color: $color-alert
+    }
 }
 
 ul.vn-autocomplete {
diff --git a/front/core/components/textfield/style.scss b/front/core/components/textfield/style.scss
index 3ec4134bc8..96ea21345a 100644
--- a/front/core/components/textfield/style.scss
+++ b/front/core/components/textfield/style.scss
@@ -149,6 +149,10 @@ vn-textfield {
     .infix.invalid + .underline {
         background-color: #d50000;
     }
+
+    label span:nth-child(2) {
+        color: $color-alert
+    }
 }
 
 vn-table {
diff --git a/front/core/components/textfield/textfield.html b/front/core/components/textfield/textfield.html
index 86bffb159e..0c10581481 100644
--- a/front/core/components/textfield/textfield.html
+++ b/front/core/components/textfield/textfield.html
@@ -14,7 +14,10 @@
                 ng-focus="$ctrl.hasFocus = true"
                 ng-blur="$ctrl.hasFocus = false"
                 tabindex="{{$ctrl.input.tabindex}}"/>
-            <label class="label" translate>{{::$ctrl.label}}</label>
+            <label class="label">
+                <span translate>{{::$ctrl.label}}</span>
+                <span translate ng-show="::$ctrl.required">(*)</span>
+            </label> 
         </div>
         <div class="underline"></div>
         <div class="selected underline"></div>
diff --git a/front/core/components/textfield/textfield.js b/front/core/components/textfield/textfield.js
index fcf823c6b1..bf6d5bfd50 100644
--- a/front/core/components/textfield/textfield.js
+++ b/front/core/components/textfield/textfield.js
@@ -84,6 +84,7 @@ ngModule.component('vnTextfield', {
         label: '@?',
         name: '@?',
         disabled: '<?',
+        required: '@?',
         readonly: '<?',
         rule: '@?',
         type: '@?',
diff --git a/modules/client/back/models/bank-entity.js b/modules/client/back/models/bank-entity.js
new file mode 100644
index 0000000000..7a2cad5949
--- /dev/null
+++ b/modules/client/back/models/bank-entity.js
@@ -0,0 +1,5 @@
+module.exports = Self => {
+    Self.validatesPresenceOf('name', {
+        message: 'Name cannot be blank'
+    });
+};
diff --git a/modules/client/front/billing-data/index.html b/modules/client/front/billing-data/index.html
index b17f5dbf1b..a7bcb71bd5 100644
--- a/modules/client/front/billing-data/index.html
+++ b/modules/client/front/billing-data/index.html
@@ -98,28 +98,33 @@
         <vn-horizontal>
             <vn-textfield vn-one
                 label="Name"
-                model="$ctrl.newBankEntity.name">
+                model="$ctrl.newBankEntity.name"
+                required="true">
             </vn-textfield>
         </vn-horizontal>
         <vn-horizontal>
-            <vn-autocomplete vn-one
+            <vn-autocomplete vn-id="country" vn-one
                 label="Country"
                 field="$ctrl.newBankEntity.countryFk"
+                fields="['id', 'country', 'code']"
                 url="/client/api/Countries"
                 value-field="id"
-                show-field="country">
+                show-field="country"
+                required="true">
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>
             <vn-textfield vn-one
-                label="Code"
-                model="$ctrl.newBankEntity.id">
+                label="Entity Code"
+                model="$ctrl.newBankEntity.id"
+                ng-show="country.selection.code === 'ES'">
             </vn-textfield>
         </vn-horizontal>
         <vn-horizontal>
             <vn-textfield vn-one
                 label="Swift / BIC"
-                model="$ctrl.newBankEntity.bic">
+                model="$ctrl.newBankEntity.bic"
+                required="true">
             </vn-textfield>
         </vn-horizontal>
     </tpl-body>
diff --git a/modules/client/front/billing-data/index.js b/modules/client/front/billing-data/index.js
index 761877600c..edd6db6546 100644
--- a/modules/client/front/billing-data/index.js
+++ b/modules/client/front/billing-data/index.js
@@ -59,8 +59,6 @@ export default class Controller {
             try {
                 if (!this.newBankEntity.name)
                     throw new Error(`Name can't be empty`);
-                if (!this.newBankEntity.id)
-                    throw new Error(`Code can't be empty`);
                 if (!this.newBankEntity.bic)
                     throw new Error(`Swift / BIC can't be empty`);
 
diff --git a/modules/client/front/billing-data/locale/es.yml b/modules/client/front/billing-data/locale/es.yml
index 84de936953..15373914ec 100644
--- a/modules/client/front/billing-data/locale/es.yml
+++ b/modules/client/front/billing-data/locale/es.yml
@@ -16,4 +16,4 @@ Save: Guardar
 New bank entity: Nueva entidad bancaria
 Name can't be empty: El nombre no puede quedar vacío
 Swift / BIC can't be empty: El Swift / BIC no puede quedar vacío
-Code: Código
\ No newline at end of file
+Entity Code: Código
\ No newline at end of file