diff --git a/src/main/resources/templates/fragments.html b/src/main/resources/templates/fragments.html
index 8f32518..eef016f 100644
--- a/src/main/resources/templates/fragments.html
+++ b/src/main/resources/templates/fragments.html
@@ -38,19 +38,19 @@
                     <div class="form-group d-flex flex-row align-items-center">
                         <input id="redirectURL" name="redirect" type="hidden" value="">
                         <!--suppress HtmlFormInputWithoutLabel -->
-                        <input class="form-control form-control-sm" id="username" name="username" placeholder="Username" type="text">
+                        <input class="form-control form-control-sm" id="username" name="username" placeholder="Username" type="text" autocomplete="username">
                         <!--suppress HtmlFormInputWithoutLabel -->
-                        <input class="form-control form-control-sm" id="password" name="password" placeholder="Password" type="password">
+                        <input class="form-control form-control-sm" id="password" name="password" placeholder="Password" type="password" autocomplete="current-password">
                         <input name="${_csrf.parameterName}" type="hidden" value="${_csrf.token}"/>
                         <button class="btn btn-primary btn-sm text-nowrap" type="submit">Log In</button>
                     </div>
+                    <script>
+                      // Set logging in via this page to redirect back to this exact page
+                      document.getElementById('redirectURL').setAttribute('value', window.location.href)
+                    </script>
                 </form>
             </div>
         </div>
-        <script>
-          // Set logging in via this page to redirect back to this exact page
-          document.getElementById('redirectURL').setAttribute('value', window.location.href)
-        </script>
     </nav>
 </div>
 <div th:fragment="searchBarRow">
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index abd7c0e..6d4bd1c 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -19,11 +19,11 @@
                     <input name="redirect" th:value="${redirect}" type="hidden">
                     <span th:text="${message}"></span>
                     <div class="form-floating mb-3">
-                        <input autofocus class="form-control form-control-lg" id="username" name="username" type="text">
+                        <input autofocus class="form-control form-control-lg" id="username" name="username" type="text" autocomplete="username">
                         <label for="username">Username</label>
                     </div>
                     <div class="form-floating mb-3">
-                        <input class="form-control form-control-lg" id="password" name="password" type="password">
+                        <input class="form-control form-control-lg" id="password" name="password" type="password" autocomplete="current-password">
                         <label for="password">Password</label>
                     </div>
                     <div class="mb-3">
diff --git a/src/main/resources/templates/user.html b/src/main/resources/templates/user.html
index a7520b1..f429251 100644
--- a/src/main/resources/templates/user.html
+++ b/src/main/resources/templates/user.html
@@ -26,13 +26,13 @@
                 </div>
                 <div class="input-group mb-3">
                     <span class="input-group-text">Password</span>
-                    <input aria-label="Password" class="form-control" th:field="*{password}" type="password">
+                    <input aria-label="Password" class="form-control" th:field="*{password}" type="password" autocomplete="new-password">
                 </div>
                 <p>Please enter your existing password to update your profile.</p>
                 <div class="input-group mb-3">
                     <span class="input-group-text">Existing Password</span>
                     <input aria-label="Existing Password" class="form-control form-control-lg" th:field="*{oldPassword}"
-                           type="password">
+                           type="password" autocomplete="current-password">
                 </div>
             </div>
         </div>