diff --git a/server/templates/login_otp.html b/server/templates/login_otp.html
index 3830e5e7b5fabe65fe4732892de42e5a3ded6f1b..3a477b3aab2622c67e21aec74aa164b2b32bf270 100644
--- a/server/templates/login_otp.html
+++ b/server/templates/login_otp.html
@@ -12,7 +12,7 @@
       {{end}}
 
       <label for="inputOTP" class="sr-only">OTP</label>
-      <input type="text" id="inputOTP" name="otp" size="6" class="form-control" required autofocus>
+      <input type="text" id="inputOTP" name="otp" size="6" class="form-control" required autofocus autocomplete="off">
 
       <button type="submit" class="btn btn-primary">Login</button>
 
diff --git a/server/templates/login_password.html b/server/templates/login_password.html
index 5b447823d5810c201f8d72c78f39320a9a546987..f09b92d8ecac816a33079422533c28817b94621f 100644
--- a/server/templates/login_password.html
+++ b/server/templates/login_password.html
@@ -20,13 +20,13 @@
              value="{{.Username}}"
              {{else}}
              placeholder="Username"
-             {{end}} required autofocus>
+             {{end}} autocomplete="off" required autofocus>
 
       <label for="inputPassword" class="sr-only">
         Password
       </label>
       <input type="password" name="password" id="inputPassword"
-             class="form-control" placeholder="Password" required>
+             class="form-control" placeholder="Password" autocomplete="off" required>
 
       {{if .AccountRecoveryURL}}
       <p>