diff --git a/apps/settings/templates/settings/personal/security/password.php b/apps/settings/templates/settings/personal/security/password.php
index 5ffa9aaf8bcb5..88536ab6b238a 100644
--- a/apps/settings/templates/settings/personal/security/password.php
+++ b/apps/settings/templates/settings/personal/security/password.php
@@ -41,14 +41,14 @@
 				<label for="pass1" class="hidden-visually"><?php p($l->t('Current password')); ?>: </label>
 				<input type="password" id="pass1" name="oldpassword"
 					   placeholder="<?php p($l->t('Current password'));?>"
-					   autocomplete="off" autocapitalize="none" autocorrect="off" />
+					   autocomplete="current-password" autocapitalize="none" autocorrect="off" />
 
 				<div class="personal-show-container">
 					<label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
 					<input type="password" id="pass2" name="newpassword"
 						   placeholder="<?php p($l->t('New password')); ?>"
 						   data-typetoggle="#personal-show"
-						   autocomplete="off" autocapitalize="none" autocorrect="off" />
+						   autocomplete="new-password" autocapitalize="none" autocorrect="off" />
 					<input type="checkbox" id="personal-show" class="hidden-visually" name="show" /><label for="personal-show" class="personal-show-label"></label>
 				</div>
 
diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
index c75b6f2c7ea46..1a4b774cb530c 100644
--- a/core/src/components/login/LoginForm.vue
+++ b/core/src/components/login/LoginForm.vue
@@ -59,7 +59,7 @@
 					v-model="user"
 					type="text"
 					name="user"
-					autocapitalize="off"
+					autocapitalize="off" autocorrect="off"
 					:autocomplete="autoCompleteAllowed ? 'on' : 'off'"
 					:placeholder="t('core', 'Username or email')"
 					:aria-label="t('core', 'Username or email')"
@@ -74,8 +74,8 @@
 					ref="password"
 					:type="passwordInputType"
 					class="password-with-toggle"
-					name="password"
-					:autocomplete="autoCompleteAllowed ? 'on' : 'off'"
+					name="password" autocorrect="off" autocapitalize="none"
+					:autocomplete="autoCompleteAllowed ? 'current-password' : 'off'"
 					:placeholder="t('core', 'Password')"
 					:aria-label="t('core', 'Password')"
 					required>
diff --git a/core/src/components/login/UpdatePassword.vue b/core/src/components/login/UpdatePassword.vue
index cb615a846d2ff..1e2ed80978f8e 100644
--- a/core/src/components/login/UpdatePassword.vue
+++ b/core/src/components/login/UpdatePassword.vue
@@ -29,6 +29,7 @@
 					v-model="password"
 					type="password"
 					name="password"
+					autocomplete="current-password" autocapitalize="none" autocorrect="off"
 					required
 					:placeholder="t('core', 'New password')">
 			</p>