diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
index 9f0d4f9ba1..3b87a08f21 100644
--- a/core/src/components/login/LoginForm.vue
+++ b/core/src/components/login/LoginForm.vue
@@ -60,7 +60,7 @@
 					type="text"
 					name="user"
 					autocapitalize="off"
-					:autocomplete="autoCompleteAllowed ? 'on' : 'off'"
+					:autocomplete="autoCompleteAllowed ? 'username' : 'off'"
 					:placeholder="t('core', 'Username or email')"
 					:aria-label="t('core', 'Username or email')"
 					required
@@ -75,7 +75,7 @@
 					:type="passwordInputType"
 					class="password-with-toggle"
 					name="password"
-					:autocomplete="autoCompleteAllowed ? 'on' : 'off'"
+					:autocomplete="autoCompleteAllowed ? 'current-password' : 'off'"
 					:placeholder="t('core', 'Password')"
 					:aria-label="t('core', 'Password')"
 					required>