diff --git a/src/webui/www/private/preferences_content.html b/src/webui/www/private/preferences_content.html
index b4febe58c..99d4c9978 100644
--- a/src/webui/www/private/preferences_content.html
+++ b/src/webui/www/private/preferences_content.html
@@ -716,7 +716,7 @@
                         <label for="webui_password_text">QBT_TR(Password:)QBT_TR[CONTEXT=OptionsDialog]</label>
                     </td>
                     <td>
-                        <input type="password" id="webui_password_text" placeholder="QBT_TR(Change current password)QBT_TR[CONTEXT=OptionsDialog]" />
+                        <input type="password" id="webui_password_text" placeholder="QBT_TR(Change current password)QBT_TR[CONTEXT=OptionsDialog]" autocomplete="new-password" />
                     </td>
                 </tr>
             </table>
diff --git a/src/webui/www/public/login.html b/src/webui/www/public/login.html
index 929a497d4..da9f46ab4 100644
--- a/src/webui/www/public/login.html
+++ b/src/webui/www/public/login.html
@@ -62,10 +62,10 @@
             <form id="loginform">
                 <div class="row">
                     <label for="username">QBT_TR(Username)QBT_TR[CONTEXT=HttpServer]</label><br />
-                    <input type="text" id="username" name="username" /></div>
+                    <input type="text" id="username" name="username" autocomplete="username" /></div>
                 <div class="row">
                     <label for="password">QBT_TR(Password)QBT_TR[CONTEXT=HttpServer]</label><br />
-                    <input type="password" id="password" name="password" /></div>
+                    <input type="password" id="password" name="password" autocomplete="current-password" /></div>
                 <div class="row">
                     <input type="submit" id="login" value="QBT_TR(Login)QBT_TR[CONTEXT=HttpServer]" />
                 </div>