diff --git a/modules/client/front/address/create/index.js b/modules/client/front/address/create/index.js
index 02c98ab3bf..27ea5538cd 100644
--- a/modules/client/front/address/create/index.js
+++ b/modules/client/front/address/create/index.js
@@ -74,6 +74,8 @@ export default class Controller extends Section {
 
     onResponse(response) {
         this.address.postalCode = response.code;
+        this.address.city = response.city;
+        this.address.provinceFk = response.provinceFk;
     }
 }
 
diff --git a/modules/client/front/address/edit/index.js b/modules/client/front/address/edit/index.js
index 363621327f..d588812fa6 100644
--- a/modules/client/front/address/edit/index.js
+++ b/modules/client/front/address/edit/index.js
@@ -78,6 +78,8 @@ export default class Controller extends Section {
 
     onResponse(response) {
         this.address.postalCode = response.code;
+        this.address.city = response.city;
+        this.address.provinceFk = response.provinceFk;
     }
 }
 
diff --git a/modules/client/front/create/index.html b/modules/client/front/create/index.html
index ec06a81476..ce2ddc38be 100644
--- a/modules/client/front/create/index.html
+++ b/modules/client/front/create/index.html
@@ -5,12 +5,6 @@
     insert-mode="true"
     form="form">
 </vn-watcher>
-<vn-crud-model
-    auto-load="true"
-    url="Towns/location"
-    data="townLocations"
-    order="name">
-</vn-crud-model>
 <form name="form" vn-http-submit="$ctrl.onSubmit()" class="vn-w-md">
     <vn-card class="vn-pa-lg">
         <vn-horizontal>
@@ -82,7 +76,7 @@
                 label="City"
                 ng-model="$ctrl.client.city"
                 selection="$ctrl.town"
-                data="townsLocation"
+                url="Towns/location"
                 fields="['id', 'name', 'provinceFk']"
                 value-field="name">
                 <tpl-item>
diff --git a/modules/client/front/create/index.js b/modules/client/front/create/index.js
index d8ded65605..1aa21c91e7 100644
--- a/modules/client/front/create/index.js
+++ b/modules/client/front/create/index.js
@@ -81,6 +81,9 @@ export default class Controller extends Section {
 
     onResponse(response) {
         this.client.postcode = response.code;
+        this.client.city = response.city;
+        this.client.provinceFk = response.provinceFk;
+        this.client.countryFk = response.countryFk;
     }
 }