diff --git a/api/js/etemplate/et2_widget_password.js b/api/js/etemplate/et2_widget_password.js
index 285363dcad..ac541259f7 100644
--- a/api/js/etemplate/et2_widget_password.js
+++ b/api/js/etemplate/et2_widget_password.js
@@ -240,7 +240,7 @@ var et2_password = /** @class */ (function (_super) {
         "autocomplete": {
             "name": "Autocomplete",
             "type": "string",
-            "default": "Off",
+            "default": "off",
             "description": "Whether or not browser should autocomplete that field: 'on', 'off', 'default' (use attribute from form). Default value is set to off."
         },
         "viewable": {
diff --git a/api/js/etemplate/et2_widget_password.ts b/api/js/etemplate/et2_widget_password.ts
index 0a1a8a807e..7557a987a9 100644
--- a/api/js/etemplate/et2_widget_password.ts
+++ b/api/js/etemplate/et2_widget_password.ts
@@ -34,7 +34,7 @@ export class et2_password extends et2_textbox
 		"autocomplete": {
 			"name": "Autocomplete",
 			"type": "string",
-			"default": "Off",
+			"default": "off",
 			"description": "Whether or not browser should autocomplete that field: 'on', 'off', 'default' (use attribute from form). Default value is set to off."
 		},
 		"viewable": {
diff --git a/preferences/templates/default/password.xet b/preferences/templates/default/password.xet
index e9717a9981..ff4ca23cb8 100644
--- a/preferences/templates/default/password.xet
+++ b/preferences/templates/default/password.xet
@@ -11,7 +11,7 @@
 			<rows>
 				<row>
 					<description value="Enter your new password"/>
-					<passwd id="n_passwd" class="et2_required" suggest="16"/>
+					<passwd id="n_passwd" class="et2_required" suggest="16" autocomplete="new-password"/>
 				</row>
 				<row>
 					<description value="Re-enter your password"/>
@@ -71,7 +71,7 @@
 				<row>
 					<description value="Current password" for="password"/>
 					<hbox>
-						<passwd id="password" needed="true" autocomplete="off"/>
+						<passwd id="password" needed="true" autocomplete="current-password"/>
 						<description value=" "/>
 						<description value="You need to enter your password to make any security changes!"/>
 					</hbox>