diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 9201c90ec..470d2152f 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -90,7 +90,7 @@ export default {
         newBankEntityButton: 'vn-client-billing-data vn-icon-button[vn-tooltip="New bank entity"] > button',
         newBankEntityName: 'vn-client-billing-data > vn-dialog vn-textfield[label="Name"] input',
         newBankEntityBIC: 'vn-client-billing-data > vn-dialog vn-textfield[label="Swift / BIC"] input',
-        newBankEntityCode: 'vn-client-billing-data > vn-dialog vn-textfield[label="Code"] input',
+        newBankEntityCode: 'vn-client-billing-data > vn-dialog vn-textfield[label="Entity Code"] input',
         acceptBankEntityButton: 'vn-client-billing-data > vn-dialog button[response="ACCEPT"]',
         saveButton: `${components.vnSubmit}`
     },
diff --git a/front/core/components/submit/submit.js b/front/core/components/submit/submit.js
index c1199d033..41d63cf1d 100644
--- a/front/core/components/submit/submit.js
+++ b/front/core/components/submit/submit.js
@@ -1,7 +1,9 @@
 import ngModule from '../../module';
+import Input from '../../lib/input';
 
-export default class Controller {
-    constructor($element) {
+export default class Controller extends Input {
+    constructor($element, $scope) {
+        super($element, $scope);
         this.$element = $element;
         this.input = $element[0].querySelector('input');
     }
@@ -11,7 +13,7 @@ export default class Controller {
     }
 }
 
-Controller.$inject = ['$element'];
+Controller.$inject = ['$element', '$scope'];
 
 ngModule.component('vnSubmit', {
     template: require('./submit.html'),
diff --git a/front/core/directives/http-click.js b/front/core/directives/http-click.js
new file mode 100644
index 000000000..5e69d81d1
--- /dev/null
+++ b/front/core/directives/http-click.js
@@ -0,0 +1,29 @@
+import ngModule from '../module';
+
+/**
+ * Disables a clicked element while request is being processed
+ * Enables again when promise ends
+ *
+ * @param {Object} $parse
+ * @return {Object} The directive
+ */
+export function directive($parse) {
+    return {
+        restrict: 'A',
+        link: function($scope, $element, $attrs) {
+            const cb = $parse($attrs.vnHttpClick);
+            const element = $element[0];
+            $element.on('click', () => {
+                element.$ctrl.disabled = true;
+
+                cb($scope).finally(() => {
+                    element.$ctrl.disabled = false;
+                });
+            });
+        }
+    };
+}
+
+directive.$inject = ['$parse'];
+
+ngModule.directive('vnHttpClick', directive);
diff --git a/front/core/directives/http-submit.js b/front/core/directives/http-submit.js
new file mode 100644
index 000000000..0cf17866e
--- /dev/null
+++ b/front/core/directives/http-submit.js
@@ -0,0 +1,37 @@
+import ngModule from '../module';
+
+/**
+ * Disables a submitted form while request is being processed
+ * Enables again when promise ends
+ *
+ * @param {Object} $parse
+ * @return {Object} The directive
+ */
+export function directive($parse) {
+    return {
+        restrict: 'A',
+        link: function($scope, $element, $attrs) {
+            const cb = $parse($attrs.vnHttpSubmit);
+            const element = $element[0];
+            $element.on('submit', () => {
+                const selector = 'vn-textfield, vn-autocomplete, vn-submit';
+                const elements = element.querySelectorAll(selector);
+                const fields = angular.element(elements);
+
+                angular.forEach(fields, field => {
+                    field.$ctrl.disabled = true;
+                });
+
+                cb($scope).finally(() => {
+                    angular.forEach(fields, field => {
+                        field.$ctrl.disabled = false;
+                    });
+                });
+            });
+        }
+    };
+}
+
+directive.$inject = ['$parse'];
+
+ngModule.directive('vnHttpSubmit', directive);
diff --git a/front/core/directives/index.js b/front/core/directives/index.js
index 7db806caf..08adfac07 100644
--- a/front/core/directives/index.js
+++ b/front/core/directives/index.js
@@ -13,3 +13,5 @@ import './title';
 import './uvc';
 import './draggable';
 import './droppable';
+import './http-click';
+import './http-submit';
diff --git a/modules/agency/front/create/index.html b/modules/agency/front/create/index.html
index d25c91219..461829259 100644
--- a/modules/agency/front/create/index.html
+++ b/modules/agency/front/create/index.html
@@ -6,7 +6,7 @@
     save="post">
 </vn-watcher>
 <div class="content-block">
-    <form name="form" ng-submit="$ctrl.onSubmit()" compact>
+    <form name="form" vn-http-submit="$ctrl.onSubmit()" compact>
         <vn-card pad-large>
             <vn-horizontal>
                 <vn-textfield vn-two vn-focus
diff --git a/modules/agency/front/create/index.js b/modules/agency/front/create/index.js
index 4aace46b7..98d377d0f 100644
--- a/modules/agency/front/create/index.js
+++ b/modules/agency/front/create/index.js
@@ -13,7 +13,7 @@ export default class Controller {
     }
 
     onSubmit() {
-        this.$scope.watcher.submit().then(res => {
+        return this.$scope.watcher.submit().then(res => {
             this.$state.go('zone.card.location', {id: res.data.id});
         });
     }
diff --git a/modules/claim/front/action/index.html b/modules/claim/front/action/index.html
index 4d0de4d1d..acee9b3e6 100644
--- a/modules/claim/front/action/index.html
+++ b/modules/claim/front/action/index.html
@@ -18,7 +18,7 @@
                 <vn-tool-bar margin-medium-bottom>
                     <vn-button
                         label="Import claim" 
-                        ng-click="$ctrl.importToNewRefundTicket()"
+                        vn-http-click="$ctrl.importToNewRefundTicket()"
                         vn-tooltip="Imports claim details">
                     </vn-button>
                     <vn-button
@@ -115,11 +115,10 @@
         </vn-vertical>
     </vn-card>
     <vn-button-bar>
-        {{$ctrl.resolvedStateText}}
         <vn-button 
             label="Regularize" 
-            ng-click="$ctrl.regularize()"
-            disabled="$ctrl.claim.claimStateFk == $ctrl.resolvedState">
+            disabled="$ctrl.claim.claimStateFk == $ctrl.resolvedState"
+            vn-http-click="$ctrl.regularize()">
         </vn-button>
     </vn-button-bar>
     <!-- WIP
diff --git a/modules/claim/front/action/index.js b/modules/claim/front/action/index.js
index f8612a992..5193b5114 100644
--- a/modules/claim/front/action/index.js
+++ b/modules/claim/front/action/index.js
@@ -62,7 +62,7 @@ class Controller {
 
     importToNewRefundTicket() {
         let query = `claim/api/ClaimBeginnings/${this.$stateParams.id}/importToNewRefundTicket`;
-        this.$http.post(query).then(() => {
+        return this.$http.post(query).then(() => {
             this.$.model.refresh();
             this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
         });
@@ -133,7 +133,7 @@ class Controller {
     regularize() {
         let data = {claimFk: this.$stateParams.id};
         let query = `/claim/api/Claims/regularizeClaim`;
-        this.$http.post(query, data).then(() => {
+        return this.$http.post(query, data).then(() => {
             this.card.reload();
             this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
             if (this.claim.responsibility >= Math.ceil(this.maxResponsibility) / 2)
diff --git a/modules/claim/front/development/index.html b/modules/claim/front/development/index.html
index 5227c6977..e3f368451 100644
--- a/modules/claim/front/development/index.html
+++ b/modules/claim/front/development/index.html
@@ -39,7 +39,7 @@
 <vn-vertical compact>
     <vn-card pad-large>
         <vn-vertical>
-            <form name="form" ng-submit="$ctrl.onSubmit()">
+            <form name="form">
                 <vn-horizontal ng-repeat="claimDevelopment in claimDevelopments">
                     <vn-autocomplete
                         vn-one
diff --git a/modules/client/front/basic-data/index.html b/modules/client/front/basic-data/index.html
index f31ab8138..6fb455a76 100644
--- a/modules/client/front/basic-data/index.html
+++ b/modules/client/front/basic-data/index.html
@@ -5,63 +5,65 @@
     form="form"
     save="patch">
 </vn-watcher>
-<form name="form" ng-submit="watcher.submit()" compact>
-    <vn-card pad-large>
-        <vn-horizontal>
-            <vn-textfield
-                vn-one 
-                label="Comercial Name" 
-                field="$ctrl.client.name" vn-focus>
-            </vn-textfield>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-textfield
-                vn-one
-                label="Contact"
-                field="$ctrl.client.contact">
-            </vn-textfield>
-            <vn-textfield
-                vn-one 
-                label="Email" 
-                field="$ctrl.client.email" 
-                info="You can save multiple emails">
-            </vn-textfield>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-textfield
-                vn-one
-                label="Phone"
-                field="$ctrl.client.phone">
-            </vn-textfield>
-            <vn-textfield
-                vn-one
-                label="Mobile"
-                field="$ctrl.client.mobile">
-            </vn-textfield>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-autocomplete 
-                vn-one
-                disabled="false"
-                field="$ctrl.client.salesPersonFk"
-                url="/client/api/Clients/activeWorkersWithRole"
-                show-field="nickname"
-                search-function="{firstName: $search}"
-                value-field="id"
-                where="{role: 'employee'}"
-                label="Salesperson"
-                vn-acl="salesAssistant">
-            </vn-autocomplete>
-            <vn-autocomplete
-                vn-one
-                initial-data="$ctrl.client.contactChannel"
-                field="$ctrl.client.contactChannelFk"
-                url="/client/api/ContactChannels"
-                label="Channel">
-            </vn-autocomplete>
-        </vn-horizontal>
-    </vn-card>
-    <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-    </vn-button-bar>
+<form name="form" vn-http-submit="watcher.submit()" compact>
+    <fieldset>
+        <vn-card pad-large>
+            <vn-horizontal>
+                <vn-textfield
+                    vn-one 
+                    label="Comercial Name" 
+                    field="$ctrl.client.name" vn-focus>
+                </vn-textfield>
+            </vn-horizontal>
+            <vn-horizontal>
+                <vn-textfield
+                    vn-one
+                    label="Contact"
+                    field="$ctrl.client.contact">
+                </vn-textfield>
+                <vn-textfield
+                    vn-one 
+                    label="Email" 
+                    field="$ctrl.client.email" 
+                    info="You can save multiple emails">
+                </vn-textfield>
+            </vn-horizontal>
+            <vn-horizontal>
+                <vn-textfield
+                    vn-one
+                    label="Phone"
+                    field="$ctrl.client.phone">
+                </vn-textfield>
+                <vn-textfield
+                    vn-one
+                    label="Mobile"
+                    field="$ctrl.client.mobile">
+                </vn-textfield>
+            </vn-horizontal>
+            <vn-horizontal>
+                <vn-autocomplete 
+                    vn-one
+                    disabled="false"
+                    field="$ctrl.client.salesPersonFk"
+                    url="/client/api/Clients/activeWorkersWithRole"
+                    show-field="nickname"
+                    search-function="{firstName: $search}"
+                    value-field="id"
+                    where="{role: 'employee'}"
+                    label="Salesperson"
+                    vn-acl="salesAssistant">
+                </vn-autocomplete>
+                <vn-autocomplete
+                    vn-one
+                    initial-data="$ctrl.client.contactChannel"
+                    field="$ctrl.client.contactChannelFk"
+                    url="/client/api/ContactChannels"
+                    label="Channel">
+                </vn-autocomplete>
+            </vn-horizontal>
+        </vn-card>
+        <vn-button-bar>
+            <vn-submit label="Save"></vn-submit>
+        </vn-button-bar>
+    </fieldset>
 </form>
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 4f9de3a36..1c8774239 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -11,7 +11,7 @@
                     <vn-button
                         disabled="!$ctrl.isEditable"
                         label="Ok"
-                        ng-click="$ctrl.onStateOkClick()"
+                        vn-http-click="$ctrl.onStateOkClick()"
                         vn-tooltip="Change ticket state to 'Ok'">
                     </vn-button>
                     <vn-button-menu
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index c5c70998f..ad232dc7b 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -115,7 +115,7 @@ class Controller {
     onStateOkClick() {
         let filter = {where: {code: 'OK'}, fields: ['id']};
         let json = encodeURIComponent(JSON.stringify(filter));
-        this.$http.get(`/api/States?filter=${json}`).then(res => {
+        return this.$http.get(`/api/States?filter=${json}`).then(res => {
             this.onStateChange(res.data[0].id);
         });
     }