diff --git a/templates/login/form.twig b/templates/login/form.twig
index ef694492df..3c064d836a 100644
--- a/templates/login/form.twig
+++ b/templates/login/form.twig
@@ -20,7 +20,7 @@
 {% endif %}
 
 <form method="post" id="login_form" action="index.php?route=/" name="login_form" class="
-  {{- not is_session_expired ? 'disableAjax hide ' }}login js-show form-horizontal"{{ not has_autocomplete ? ' autocomplete="on"' }}>
+  {{- not is_session_expired ? 'disableAjax hide ' }}login js-show form-horizontal"{{ not has_autocomplete ? ' autocomplete="off"' }}>
   <fieldset>
     <legend class="col-form-label">
       <input type="hidden" name="set_session" value="{{ session_id }}">
@@ -46,7 +46,7 @@
         {% trans 'Username:' %}
       </label>
       <div class="col-8">
-        <input type="text" name="pma_username" id="input_username" value="{{ default_user }}" size="24" class="textfield form-control" autocomplete="on">
+        <input type="text" name="pma_username" id="input_username" value="{{ default_user }}" size="24" class="textfield form-control" autocomplete="pma_username">
       </div>
     </div>
 
@@ -55,7 +55,7 @@
         {% trans 'Password:' %}
       </label>
       <div class="col-8">
-        <input type="password" name="pma_password" id="input_password" value="" size="24" class="textfield form-control" autocomplete="on">
+        <input type="password" name="pma_password" id="input_password" value="" size="24" class="textfield form-control" autocomplete="pma_password">
       </div>
     </div>