diff --git a/package/share/ahriman/templates/build-status.jinja2 b/package/share/ahriman/templates/build-status.jinja2
index eeca8ded..961e78ef 100644
--- a/package/share/ahriman/templates/build-status.jinja2
+++ b/package/share/ahriman/templates/build-status.jinja2
@@ -12,6 +12,8 @@
 
     <body>
 
+        {% include "utils/bootstrap-scripts.jinja2" %}
+
         <div class="container">
             <h1>ahriman
                 <img id="badge-version" src="https://img.shields.io/badge/version-unknown-informational" alt="unknown">
@@ -106,8 +108,6 @@
             {% include "build-status/login-modal.jinja2" %}
         {% endif %}
 
-        {% include "utils/bootstrap-scripts.jinja2" %}
-
         {% include "build-status/failed-modal.jinja2" %}
         {% include "build-status/success-modal.jinja2" %}
 
diff --git a/package/share/ahriman/templates/build-status/login-modal.jinja2 b/package/share/ahriman/templates/build-status/login-modal.jinja2
index 19c2a2c2..d2e7a3fb 100644
--- a/package/share/ahriman/templates/build-status/login-modal.jinja2
+++ b/package/share/ahriman/templates/build-status/login-modal.jinja2
@@ -16,7 +16,12 @@
                     <div class="form-group row">
                         <label for="password" class="col-sm-2 col-form-label">password</label>
                         <div class="col-sm-10">
-                            <input id="password" type="password" class="form-control" placeholder="enter password" name="password" required>
+                            <div class="input-group">
+                                <input id="password" type="password" class="form-control" placeholder="enter password" name="password" required>
+                                <div class="input-group-append">
+                                    <button class="btn btn-outline-secondary" type="button" onclick="showPassword()"><i id="show-hide-password" class="bi bi-eye"></i></button>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -27,3 +32,20 @@
         </div>
     </div>
 </div>
+
+<script>
+    const passwordInput = $("#password");
+    const showHidePasswordButton = $("#show-hide-password");
+
+    function showPassword() {
+        if (passwordInput.attr("type") === "password") {
+            passwordInput.attr("type", "text");
+            showHidePasswordButton.removeClass("bi-eye");
+            showHidePasswordButton.addClass("bi-eye-slash");
+        } else {
+            passwordInput.attr("type", "password");
+            showHidePasswordButton.removeClass("bi-eye-slash");
+            showHidePasswordButton.addClass("bi-eye");
+        }
+    }
+</script>
diff --git a/package/share/ahriman/templates/error.jinja2 b/package/share/ahriman/templates/error.jinja2
index a7e627d7..805690f1 100644
--- a/package/share/ahriman/templates/error.jinja2
+++ b/package/share/ahriman/templates/error.jinja2
@@ -12,6 +12,8 @@
 
     <body>
 
+        {% include "utils/bootstrap-scripts.jinja2" %}
+
         <div class="d-flex flex-row align-items-center">
             <div class="container">
                 <div class="row justify-content-center">
@@ -24,8 +26,6 @@
             </div>
         </div>
 
-        {% include "utils/bootstrap-scripts.jinja2" %}
-
     </body>
 
 </html>
\ No newline at end of file
diff --git a/package/share/ahriman/templates/repo-index.jinja2 b/package/share/ahriman/templates/repo-index.jinja2
index b0d933c4..e5b559a9 100644
--- a/package/share/ahriman/templates/repo-index.jinja2
+++ b/package/share/ahriman/templates/repo-index.jinja2
@@ -10,6 +10,8 @@
 
     <body>
 
+        {% include "utils/bootstrap-scripts.jinja2" %}
+
         <div class="container">
             <h1>Arch linux user repository</h1>
         </div>
@@ -93,8 +95,6 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa
             </footer>
         </div>
 
-        {% include "utils/bootstrap-scripts.jinja2" %}
-
         <script>
             const pacmanConf = $("#pacman-conf");
             const pacmanConfCopyButton = $("#copy-btn");
