diff --git a/src/views/login.ejs b/src/views/login.ejs
index 56c2bf762..d013b1b15 100644
--- a/src/views/login.ejs
+++ b/src/views/login.ejs
@@ -34,14 +34,14 @@
                 <div class="form-group">
                     <label for="password"><%= t("login.password") %></label>
                     <div class="controls">
-                        <input id="password" name="password" placeholder="" class="form-control" type="password" autofocus>
+                        <input id="password" name="password" placeholder="" class="form-control" type="password" autocomplete="current-password" autofocus>
                     </div>
                 </div>
                 <% if( totpEnabled ) { %>
                     <div class="form-group">
                         <label for="totpToken">TOTP Token</label>
                         <div class="controls">
-                            <input id="totpToken" name="totpToken" placeholder="" class="form-control" type="text" required />
+                            <input id="totpToken" name="totpToken" placeholder="" class="form-control" type="text" autocomplete="one-time-code" required />
                         </div>
                     </div>
                 <% } %>