diff --git a/client/client/src/create/create.html b/client/client/src/create/create.html
index 5d1f62db9..aa999bbe2 100644
--- a/client/client/src/create/create.html
+++ b/client/client/src/create/create.html
@@ -20,13 +20,20 @@
                 </vn-horizontal>
                 <vn-horizontal>
                     <vn-textfield vn-one label="Email" field="$ctrl.client.email" info="You can save multiple emails by chaining them using comma without spaces, example: user@domain.com,user2@domain.com the first email will be considered as the main"></vn-textfield>
-                    <vn-one></vn-one>
+                    <vn-autocomplete vn-one
+                        field="$ctrl.client.salesPersonFk"
+                        url="/client/api/Clients/activeSalesPerson"
+                        show-field="name"
+                        value-field="id"
+                        select-fields="surname"
+                        label="Salesperson"
+                        filter-search="{where: {or: [{name: {regexp: 'search'}}, {surname: {regexp: 'search'}}]}}"
+                    ></vn-autocomplete>
                 </vn-horizontal>
             </vn-vertical>
         </vn-card>
         <vn-button-bar>
-            <vn-submit label="Create and edit"></vn-submit>
-            <vn-button label="Create" ng-click="watcher.submitBack()"></vn-button>
+            <vn-submit label="Create"></vn-submit>
         </vn-button-bar>
     </div>
 </form>
diff --git a/services/client/common/methods/client/before-save.js b/services/client/common/methods/client/before-save.js
index 74b9ce7a6..470b7ba3f 100644
--- a/services/client/common/methods/client/before-save.js
+++ b/services/client/common/methods/client/before-save.js
@@ -29,9 +29,9 @@ module.exports = function(Client) {
                 && instance.dueDay == ctx.data.dueDay)
                     ctx.data.dueDay = 5;
 
-                if (instance.fi && ctx.data.equalizationTax && !canMarkEqualizationTax(instance)){
+                if (instance.fi && ctx.data.equalizationTax && !canMarkEqualizationTax(instance)) {
                     next(generateErrorEqualizationTax());
-                } else if (instance.equalizationTax !== undefined && instance.equalizationTax && ctx.data.fi && canMarkEqualizationTax(ctx.data)){
+                } else if (instance.equalizationTax !== undefined && instance.equalizationTax && ctx.data.fi && canMarkEqualizationTax(ctx.data)) {
                     next(generateErrorEqualizationTax());
                 } else {
                     next();
diff --git a/services/client/common/methods/client/create.js b/services/client/common/methods/client/create.js
index 58e947e3f..fcf85c0bc 100644
--- a/services/client/common/methods/client/create.js
+++ b/services/client/common/methods/client/create.js
@@ -38,7 +38,8 @@ module.exports = function(Client) {
                     fi: data.fi,
                     socialName: data.socialName,
                     id: account.id,
-                    email: data.email
+                    email: data.email,
+                    salesPersonFk: data.salesPersonFk
                 };
 
                 Client.create(client, {transaction}, (error, newClient) => {