diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
index a6bac5d5d..92693b68c 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
@@ -65,7 +65,7 @@ pgsql:host=127.0.0.1;port=5432;dbname=rainloop
 			<div class="control-group">
 				<label class="control-label" data-i18n="TAB_CONTACTS/LABEL_STORAGE_PASSWORD"></label>
 				<div class="controls">
-					<input type="password" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+					<input type="password" autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
 						data-bind="value: pdoPassword, saveTrigger: pdoPasswordTrigger" />
 					<div data-bind="saveTrigger: pdoPasswordTrigger"></div>
 				</div>
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html
index f245ecf6e..913919d3a 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html
@@ -8,7 +8,7 @@
 				data-bind="value: value, attr: {placeholder: placeholder}" />
 		<!-- /ko -->
 		<!-- ko if: 3 === Type -->
-			<input type="password" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+			<input type="password" autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
 				data-bind="value: value, attr: {placeholder: placeholder}" />
 		<!-- /ko -->
 		<!-- ko if: 2 === Type -->
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
index fb6e1ca46..d25bb6650 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
@@ -78,7 +78,7 @@
 		<div class="control-group">
 			<label class="control-label" data-i18n="TAB_SECURITY/LABEL_CURRENT_PASSWORD"></label>
 			<div class="controls">
-				<input type="password" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+				<input type="password" autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
 					data-bind="textInput: adminPassword" />
 			</div>
 		</div>
@@ -86,21 +86,21 @@
 		<div class="control-group" data-bind="css: {'error': adminLoginError}">
 			<label class="control-label" data-i18n="TAB_SECURITY/LABEL_NEW_LOGIN"></label>
 			<div class="controls">
-				<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+				<input type="text" autocomplete="username" autocorrect="off" autocapitalize="off" spellcheck="false"
 					data-bind="textInput: adminLogin" />
 			</div>
 		</div>
 		<div class="control-group" data-bind="css: {'error': adminPasswordNewError}">
 			<label class="control-label" data-i18n="TAB_SECURITY/LABEL_NEW_PASSWORD"></label>
 			<div class="controls">
-				<input type="password" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+				<input type="password" autocomplete="new-password" autocorrect="off" autocapitalize="off" spellcheck="false"
 					data-bind="textInput: adminPasswordNew" />
 			</div>
 		</div>
 		<div class="control-group" data-bind="css: {'error': adminPasswordNewError}">
 			<label class="control-label" data-i18n="TAB_SECURITY/LABEL_REPEAT_PASSWORD"></label>
 			<div class="controls">
-				<input type="password" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+				<input type="password" autocomplete="new-password" autocorrect="off" autocapitalize="off" spellcheck="false"
 					data-bind="textInput: adminPasswordNew2" />
 			</div>
 		</div>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsAccount.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsAccount.html
index 8cc8c3876..3827149d0 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsAccount.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsAccount.html
@@ -30,7 +30,7 @@
 					<div class="control-group" data-bind="css: {'error': passwordError}">
 						<label class="i18n control-label" data-i18n="LOGIN/LABEL_PASSWORD"></label>
 						<div class="controls">
-							<input type="password" class="inputPassword input-xlarge" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+							<input type="password" class="inputPassword input-xlarge" autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
 								data-bind="value: password, onEnter: addAccountCommand" />
 						</div>
 					</div>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html
index 49c65a51e..8cedd3648 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html
@@ -85,7 +85,7 @@
 					<div class="span6">
 						<div data-bind="visible: sign()">
 							<input type="password" class="inputPassword input-block-level i18n"
-								autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+								autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
 								data-i18n="[placeholder]POPUPS_COMPOSE_OPEN_PGP/LABEL_PASSWORD"
 								data-bind="textInput: password, hasfocus: password.focus, onEnter: doCommand" />
 							<div class="form-inline" data-bind="visible: 0 < privateKeysOptions().length">
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html
index 41b5b2eaa..abca830d9 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html
@@ -36,7 +36,7 @@
 					<div class="control-group">
 						<label class="i18n control-label" data-i18n="POPUPS_MESSAGE_OPEN_PGP/LABEL_PASSWORD"></label>
 						<div class="controls">
-							<input type="password" class="inputPassword input-xlarge" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+							<input type="password" class="inputPassword input-xlarge" autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
 								data-bind="textInput: password, hasfocus: password.focus, onEnter: doCommand" />
 						</div>
 					</div>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html
index f377f1282..a492b392b 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html
@@ -34,7 +34,7 @@
 						<label class="i18n control-label" data-i18n="POPUPS_GENERATE_OPEN_PGP_KEYS/LABEL_PASSWORD"></label>
 						<div class="controls">
 							<input type="password" class="inputPassword input-large"
-								autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+								autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
 								data-bind="value: password" />
 						</div>
 					</div>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsChangePassword.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsChangePassword.html
index 810e3c4d3..f0d08fe22 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsChangePassword.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsChangePassword.html
@@ -10,7 +10,7 @@
 						<span class="i18n" data-i18n="SETTINGS_CHANGE_PASSWORD/LABEL_CURRENT_PASSWORD"></span>
 					</label>
 					<div class="controls">
-						<input type="password" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+						<input type="password" autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
 							data-bind="textInput: currentPassword" />
 					</div>
 				</div>
@@ -19,7 +19,7 @@
 						<span class="i18n" data-i18n="SETTINGS_CHANGE_PASSWORD/LABEL_NEW_PASSWORD"></span>
 					</label>
 					<div class="controls">
-						<input type="password" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+						<input type="password" autocomplete="new-password" autocorrect="off" autocapitalize="off" spellcheck="false"
 							data-bind="textInput: newPassword" />
 					</div>
 				</div>
@@ -28,7 +28,7 @@
 						<span class="i18n" data-i18n="SETTINGS_CHANGE_PASSWORD/LABEL_REPEAT_PASSWORD"></span>
 					</label>
 					<div class="controls">
-						<input type="password" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+						<input type="password" autocomplete="new-password" autocorrect="off" autocapitalize="off" spellcheck="false"
 							data-bind="textInput: newPassword2" />
 					</div>
 				</div>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsContacts.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsContacts.html
index 7ace99ae4..fd2e3f9a8 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsContacts.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsContacts.html
@@ -36,9 +36,8 @@
 				<span class="i18n" data-i18n="SETTINGS_CONTACTS/LABEL_CONTACTS_SYNC_AB_URL"></span>
 			</label>
 			<div class="controls">
-				<input type="text" class="input-xxlarge"
-					autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-					data-bind="value: contactsSyncUrl" placeholder="https://" />
+				<input type="text" class="input-xxlarge" autocomplete="off" autocorrect="off" autocapitalize="off"
+					spellcheck="false" data-bind="value: contactsSyncUrl" placeholder="https://" />
 			</div>
 		</div>
 		<div class="control-group">
@@ -55,10 +54,10 @@
 				<span class="i18n" data-i18n="SETTINGS_CONTACTS/LABEL_CONTACTS_SYNC_PASSWORD"></span>
 			</label>
 			<div class="controls">
-				<input type="password" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-					data-bind="value: contactsSyncPass" />
+				<input type="password" autocomplete="current-password" autocorrect="off" autocapitalize="off"
+					spellcheck="false" data-bind="value: contactsSyncPass" />
 			</div>
 		</div>
 
 	</div>
-</div>
+</div>
\ No newline at end of file