diff --git a/client/res/templates/fields/address/edit-1.tpl b/client/res/templates/fields/address/edit-1.tpl
index 4fccb78b4a..3560bd39d6 100644
--- a/client/res/templates/fields/address/edit-1.tpl
+++ b/client/res/templates/fields/address/edit-1.tpl
@@ -1,13 +1,13 @@
-<textarea class="form-control auto-height" name="{{name}}Street" rows="1" placeholder="{{translate 'Street'}}">{{streetValue}}</textarea>
+<textarea class="form-control auto-height" name="{{name}}Street" rows="1" placeholder="{{translate 'Street'}}" autocomplete="espo-street">{{streetValue}}</textarea>
 <div class="row">
     <div class="col-sm-4 col-xs-4">
-        <input type="text" class="form-control" name="{{name}}City" value="{{cityValue}}" placeholder="{{translate 'City'}}">
+        <input type="text" class="form-control" name="{{name}}City" value="{{cityValue}}" placeholder="{{translate 'City'}}" autocomplete="espo-city">
     </div>
     <div class="col-sm-4 col-xs-4">
-        <input type="text" class="form-control" name="{{name}}State" value="{{stateValue}}" placeholder="{{translate 'State'}}">
+        <input type="text" class="form-control" name="{{name}}State" value="{{stateValue}}" placeholder="{{translate 'State'}}" autocomplete="espo-state">
     </div>
     <div class="col-sm-4 col-xs-4">
-        <input type="text" class="form-control" name="{{name}}PostalCode" value="{{postalCodeValue}}" placeholder="{{translate 'PostalCode'}}">
+        <input type="text" class="form-control" name="{{name}}PostalCode" value="{{postalCodeValue}}" placeholder="{{translate 'PostalCode'}}" autocomplete="espo-postalCode">
     </div>
 </div>
-<input type="text" class="form-control" name="{{name}}Country" value="{{countryValue}}" placeholder="{{translate 'Country'}}">
+<input type="text" class="form-control" name="{{name}}Country" value="{{countryValue}}" placeholder="{{translate 'Country'}}" autocomplete="espo-country">
diff --git a/client/res/templates/fields/address/edit-2.tpl b/client/res/templates/fields/address/edit-2.tpl
index a7de324fe6..ec83d3bad6 100644
--- a/client/res/templates/fields/address/edit-2.tpl
+++ b/client/res/templates/fields/address/edit-2.tpl
@@ -1,17 +1,17 @@
-<textarea class="form-control auto-height" name="{{name}}Street" rows="1" placeholder="{{translate 'Street'}}">{{streetValue}}</textarea>
+<textarea class="form-control auto-height" name="{{name}}Street" rows="1" placeholder="{{translate 'Street'}}" autocomplete="espo-street">{{streetValue}}</textarea>
 <div class="row">
     <div class="col-sm-6 col-xs-6">
-        <input type="text" class="form-control" name="{{name}}PostalCode" value="{{postalCodeValue}}" placeholder="{{translate 'PostalCode'}}">
+        <input type="text" class="form-control" name="{{name}}PostalCode" value="{{postalCodeValue}}" placeholder="{{translate 'PostalCode'}}" autocomplete="espo-postalCode">
     </div>
     <div class="col-sm-6 col-xs-6">
-        <input type="text" class="form-control" name="{{name}}City" value="{{cityValue}}" placeholder="{{translate 'City'}}">
+        <input type="text" class="form-control" name="{{name}}City" value="{{cityValue}}" placeholder="{{translate 'City'}}" autocomplete="espo-city">
     </div>
 </div>
 <div class="row">
     <div class="col-sm-6 col-xs-6">
-        <input type="text" class="form-control" name="{{name}}State" value="{{stateValue}}" placeholder="{{translate 'State'}}">
+        <input type="text" class="form-control" name="{{name}}State" value="{{stateValue}}" placeholder="{{translate 'State'}}" autocomplete="espo-state">
     </div>
     <div class="col-sm-6 col-xs-6">
-        <input type="text" class="form-control" name="{{name}}Country" value="{{countryValue}}" placeholder="{{translate 'Country'}}">
+        <input type="text" class="form-control" name="{{name}}Country" value="{{countryValue}}" placeholder="{{translate 'Country'}}" autocomplete="espo-country">
     </div>
 </div>
diff --git a/client/res/templates/fields/address/edit-3.tpl b/client/res/templates/fields/address/edit-3.tpl
index 4952cdb50c..1fc681185d 100644
--- a/client/res/templates/fields/address/edit-3.tpl
+++ b/client/res/templates/fields/address/edit-3.tpl
@@ -1,14 +1,14 @@
 
-<input type="text" class="form-control auto-height" name="{{name}}Country" value="{{countryValue}}" placeholder="{{translate 'Country'}}">
+<input type="text" class="form-control auto-height" name="{{name}}Country" value="{{countryValue}}" placeholder="{{translate 'Country'}}" autocomplete="espo-country">
 <div class="row">
     <div class="col-sm-4 col-xs-4">
-        <input type="text" class="form-control" name="{{name}}PostalCode" value="{{postalCodeValue}}" placeholder="{{translate 'PostalCode'}}">
+        <input type="text" class="form-control" name="{{name}}PostalCode" value="{{postalCodeValue}}" placeholder="{{translate 'PostalCode'}}" autocomplete="espo-postalCode">
     </div>
     <div class="col-sm-4 col-xs-4">
-        <input type="text" class="form-control" name="{{name}}State" value="{{stateValue}}" placeholder="{{translate 'State'}}">
+        <input type="text" class="form-control" name="{{name}}State" value="{{stateValue}}" placeholder="{{translate 'State'}}" autocomplete="espo-state">
     </div>
     <div class="col-sm-4 col-xs-4">
-        <input type="text" class="form-control" name="{{name}}City" value="{{cityValue}}" placeholder="{{translate 'City'}}">
+        <input type="text" class="form-control" name="{{name}}City" value="{{cityValue}}" placeholder="{{translate 'City'}}" autocomplete="espo-city">
     </div>
 </div>
-<textarea class="form-control" name="{{name}}Street" rows="1" placeholder="{{translate 'Street'}}">{{streetValue}}</textarea>
+<textarea class="form-control" name="{{name}}Street" rows="1" placeholder="{{translate 'Street'}}" autocomplete="espo-street">{{streetValue}}</textarea>
diff --git a/client/res/templates/fields/address/edit-4.tpl b/client/res/templates/fields/address/edit-4.tpl
index fcdab75368..e5c5009eea 100644
--- a/client/res/templates/fields/address/edit-4.tpl
+++ b/client/res/templates/fields/address/edit-4.tpl
@@ -1,15 +1,14 @@
 
-<textarea class="form-control auto-height" name="{{name}}Street" rows="1" placeholder="{{translate 'Street'}}">{{streetValue}}</textarea>
-<input type="text" class="form-control" name="{{name}}City" value="{{cityValue}}" placeholder="{{translate 'City'}}">
+<textarea class="form-control auto-height" name="{{name}}Street" rows="1" placeholder="{{translate 'Street'}}" autocomplete="espo-street">{{streetValue}}</textarea>
+<input type="text" class="form-control" name="{{name}}City" value="{{cityValue}}" placeholder="{{translate 'City'}}" autocomplete="espo-city">
 <div class="row">
     <div class="col-sm-5 col-xs-5">
-        <input type="text" class="form-control" name="{{name}}Country" value="{{countryValue}}" placeholder="{{translate 'Country'}}">
+        <input type="text" class="form-control" name="{{name}}Country" value="{{countryValue}}" placeholder="{{translate 'Country'}}" autocomplete="espo-country">
     </div>
     <div class="col-sm-3 col-xs-3">
-        <input type="text" class="form-control" name="{{name}}State" value="{{stateValue}}" placeholder="{{translate 'State'}}">
+        <input type="text" class="form-control" name="{{name}}State" value="{{stateValue}}" placeholder="{{translate 'State'}}" autocomplete="espo-state">
     </div>
     <div class="col-sm-4 col-xs-4">
-        <input type="text" class="form-control" name="{{name}}PostalCode" value="{{postalCodeValue}}" placeholder="{{translate 'PostalCode'}}">
+        <input type="text" class="form-control" name="{{name}}PostalCode" value="{{postalCodeValue}}" placeholder="{{translate 'PostalCode'}}" autocomplete="espo-postalCode">
     </div>
 </div>
-
diff --git a/client/res/templates/fields/address/edit.tpl b/client/res/templates/fields/address/edit.tpl
index 4fccb78b4a..3560bd39d6 100644
--- a/client/res/templates/fields/address/edit.tpl
+++ b/client/res/templates/fields/address/edit.tpl
@@ -1,13 +1,13 @@
-<textarea class="form-control auto-height" name="{{name}}Street" rows="1" placeholder="{{translate 'Street'}}">{{streetValue}}</textarea>
+<textarea class="form-control auto-height" name="{{name}}Street" rows="1" placeholder="{{translate 'Street'}}" autocomplete="espo-street">{{streetValue}}</textarea>
 <div class="row">
     <div class="col-sm-4 col-xs-4">
-        <input type="text" class="form-control" name="{{name}}City" value="{{cityValue}}" placeholder="{{translate 'City'}}">
+        <input type="text" class="form-control" name="{{name}}City" value="{{cityValue}}" placeholder="{{translate 'City'}}" autocomplete="espo-city">
     </div>
     <div class="col-sm-4 col-xs-4">
-        <input type="text" class="form-control" name="{{name}}State" value="{{stateValue}}" placeholder="{{translate 'State'}}">
+        <input type="text" class="form-control" name="{{name}}State" value="{{stateValue}}" placeholder="{{translate 'State'}}" autocomplete="espo-state">
     </div>
     <div class="col-sm-4 col-xs-4">
-        <input type="text" class="form-control" name="{{name}}PostalCode" value="{{postalCodeValue}}" placeholder="{{translate 'PostalCode'}}">
+        <input type="text" class="form-control" name="{{name}}PostalCode" value="{{postalCodeValue}}" placeholder="{{translate 'PostalCode'}}" autocomplete="espo-postalCode">
     </div>
 </div>
-<input type="text" class="form-control" name="{{name}}Country" value="{{countryValue}}" placeholder="{{translate 'Country'}}">
+<input type="text" class="form-control" name="{{name}}Country" value="{{countryValue}}" placeholder="{{translate 'Country'}}" autocomplete="espo-country">
diff --git a/client/res/templates/fields/address/search.tpl b/client/res/templates/fields/address/search.tpl
index c4b6cb77f2..b8db739d62 100644
--- a/client/res/templates/fields/address/search.tpl
+++ b/client/res/templates/fields/address/search.tpl
@@ -1,3 +1,2 @@
 
-<input type="text" class="main-element form-control input-sm" name="{{name}}" value="{{searchData.value}}" {{#if params.maxLength}} maxlength="{{params.maxLength}}"{{/if}}{{#if params.size}} size="{{params.size}}"{{/if}}>
-
+<input type="text" class="main-element form-control input-sm" name="{{name}}" value="{{searchData.value}}" {{#if params.maxLength}} maxlength="{{params.maxLength}}"{{/if}}{{#if params.size}} size="{{params.size}}"{{/if}} autocomplete="espo-{{name}}">
diff --git a/client/res/templates/fields/text/edit.tpl b/client/res/templates/fields/text/edit.tpl
index 04d0ac19e5..f862d0b8d9 100644
--- a/client/res/templates/fields/text/edit.tpl
+++ b/client/res/templates/fields/text/edit.tpl
@@ -1,2 +1,2 @@
 
-<textarea class="main-element form-control auto-height" name="{{name}}" {{#if params.maxLength}} maxlength="{{params.maxLength}}"{{/if}} rows="{{rows}}">{{value}}</textarea>
+<textarea class="main-element form-control auto-height" name="{{name}}" {{#if params.maxLength}} maxlength="{{params.maxLength}}"{{/if}} rows="{{rows}}" autocomplete="espo-{{name}}">{{value}}</textarea>
diff --git a/client/src/views/fields/address.js b/client/src/views/fields/address.js
index 6952406bda..a8fb50a929 100644
--- a/client/src/views/fields/address.js
+++ b/client/src/views/fields/address.js
@@ -330,6 +330,8 @@ Espo.define('views/fields/address', 'views/fields/base', function (Dep) {
                     this.once('remove', function () {
                         this.$country.autocomplete('dispose');
                     }, this);
+
+                    this.$country.attr('autocomplete', 'espo-country');
                 }
 
                 this.$street.on('input', function (e) {
diff --git a/client/src/views/fields/varchar.js b/client/src/views/fields/varchar.js
index c9367ecf04..225071db16 100644
--- a/client/src/views/fields/varchar.js
+++ b/client/src/views/fields/varchar.js
@@ -137,6 +137,7 @@ Espo.define('views/fields/varchar', 'views/fields/base', function (Dep) {
                         this.trigger('change');
                     }.bind(this)
                 });
+                this.$element.attr('autocomplete', 'espo-' + this.name);
 
                 this.$element.on('focus', function () {
                     if (this.$element.val()) return;