diff --git a/modules/core/templates/loginuserpass.php b/modules/core/templates/loginuserpass.php
index cfbb1cf7bac54683c8873a6d64770f2586fa3df2..a8b0fe60b75fcc22ccab26fb85d986b13447592f 100644
--- a/modules/core/templates/loginuserpass.php
+++ b/modules/core/templates/loginuserpass.php
@@ -89,7 +89,7 @@ if ($this->data['errorcode'] !== null) {
             ?>
             <tr>
                 <td><label for="password"><?php echo $this->t('{login:password}'); ?></label></td>
-                <td><input id="password" type="password" tabindex="2" name="password" /></td>
+                <td><input id="password" type="password" tabindex="2" name="password" autocomplete="current-password" /></td>
             <?php
             if ($this->data['rememberMeEnabled']) {
                 // display the remember me checkbox (keep me logged in)
diff --git a/modules/core/templates/loginuserpass.twig b/modules/core/templates/loginuserpass.twig
index 59529528bdd73e15438da7a2e5cf4e1378284f63..ffb6e926dc61255ef0c3a0e469fab13c5ef3402a 100644
--- a/modules/core/templates/loginuserpass.twig
+++ b/modules/core/templates/loginuserpass.twig
@@ -53,8 +53,8 @@
 
                 <div class="pure-control-group">
                     <label for="password">{{ 'Password'|trans}}</label>
-                    <input id="password" type="password" tabindex="2" name="password" class="edge"
-                    {%- if forceUsername or username %} autofocus {% endif %} />
+                    <input id="password" type="password" tabindex="2" name="password" class="edge" autocomplete="current-password"
+                    {%- if forceUsername or username %} autofocus {% endif %} >
 
                 {% if rememberMeEnabled -%}
                 </div>
diff --git a/templates/login-ldapmulti.php b/templates/login-ldapmulti.php
index a53da3ebed54eb61a64264c295818351feb173a4..b4cf136dffa7f0496ddfb0de71f08c09414209f1 100644
--- a/templates/login-ldapmulti.php
+++ b/templates/login-ldapmulti.php
@@ -51,7 +51,7 @@ foreach ($this->data['ldapconfig'] as $key => $entry) {
 
             <tr>
                 <td style="padding: .3em;"><?php echo $this->t('password'); ?></td>
-                <td><input type="password" tabindex="2" name="password" /></td>
+                <td><input type="password" tabindex="2" name="password" autocomplete="current-password" /></td>
             </tr>
             <tr><td></td><td>
                 <button type="submit" tabindex="5" id="mobilesubmit" class="btn"><?php echo $this->t('login_button'); ?></button>
diff --git a/templates/login.php b/templates/login.php
index fd0755db98d529e77df255ba1baf0424a8a3ec47..fb1d7b951bf4b97fce84cc4fe4e221c187bd585d 100644
--- a/templates/login.php
+++ b/templates/login.php
@@ -43,7 +43,7 @@ if (array_key_exists('admin', $this->data)) {
             </tr>
             <tr>
                 <td style="padding: .3em;"><?php echo $this->t('password'); ?></td>
-                <td><input id="password" type="password" tabindex="2" name="password" /></td>
+                <td><input id="password" type="password" tabindex="2" name="password" autocomplete="current-password" /></td>
             </tr>
             <tr>
                 <td></td>