diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c6d9c1..9aa3db1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+
+- Password visibility toggle on login page (dashboard#46)
+
 ## [1.3.2] - 2025-12-11
 
 ### Fixed
diff --git a/src/adminui/templates/auth/login.html b/src/adminui/templates/auth/login.html
index 6a61642..4315def 100644
--- a/src/adminui/templates/auth/login.html
+++ b/src/adminui/templates/auth/login.html
@@ -1,5 +1,8 @@
 {% extends "raw_base.html" %}
 
+{# import the macro file to use the password function #}
+{% from "macros.html" import password_input %}
+
 {% block theme %}light{% endblock %}
 {% block title %}Sign into Kiwix Admin{% endblock %}
 
@@ -56,6 +59,8 @@
 			--bs-link-hover-color-rgb: 227,130,14;
 			text-decoration: none;
 		}
+
+		.password-toggle, .password-toggle:hover, .password-toggle:focus { border-color: var(--bs-border-color); }
 	</style>
 	{% endblock %}
 
@@ -71,11 +76,7 @@
 						<label class="form-label" for="username">Username</label>
 						<input type="text"  class="form-control{% if is_incorrect %} is-invalid{% endif %}" name="username" placeholder="Usually “admin”" />
 					</div>
-					<div class="mb-3">
-						<label class="form-label" for="password">Password</label>
-						<input type="password" class="form-control{% if is_incorrect %} is-invalid{% endif %}" name="password" aria-describedby="credentialsFeedback">
-						{% if is_incorrect and message_content %}<div id="credentialsFeedback" class="invalid-feedback">{{ message_content }}</div>{% endif %}
-					</div>
+					{{ password_input(name="password", error=message_content if is_incorrect else None) }}
 					<div class="d-flex flex-row-reverse">
 						<input type="submit" class="btn btn-primary" value="Sign-in" />
 					</div>
@@ -83,3 +84,27 @@
 		</div>
 		<div class="mt-1 mb-1 p-3"><a class="returnlink" href="http://{{ ctx.fqdn }}"><i class="fa-solid fa-arrow-left"></i> Return to the Hotspot</a></div>
 {% endblock %}
+
+{% block javascript %}
+<script type="text/javascript">
+    function run() {
+		live('.password-toggle', 'click', function (elem, event) {
+			// Find the input that lives in the same group as this button
+			const input = elem.parentElement.querySelector('.password-input');
+			const iconShow = elem.querySelector('.icon-show');
+			const iconHide = elem.querySelector('.icon-hide');
+
+			if (input.getAttribute('type') === 'password') {
+				input.setAttribute('type', 'text');
+				iconShow.style.display = 'none';
+				iconHide.style.display = 'block';
+			} else {
+				input.setAttribute('type', 'password');
+				iconShow.style.display = 'block';
+				iconHide.style.display = 'none';
+			}
+		});
+	}
+</script>
+</script>
+{% endblock %}
diff --git a/src/adminui/templates/icons/eye-slash.svg b/src/adminui/templates/icons/eye-slash.svg
new file mode 100644
index 0000000..cf2e54d
--- /dev/null
+++ b/src/adminui/templates/icons/eye-slash.svg
@@ -0,0 +1,5 @@
+<svg class="icon-hide" style="display: none;" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
+    <path d="M13.359 11.238C15.06 9.72 16 8 16 8s-3-5.5-8-5.5a7.028 7.028 0 0 0-2.79.588l.77.771A5.944 5.944 0 0 1 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.134 13.134 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755-.165.165-.337.328-.517.486l.708.709z"/>
+    <path d="M11.297 9.176a3.5 3.5 0 0 0-4.474-4.474l.823.823a2.5 2.5 0 0 1 2.829 2.829l.822.822zm-2.943 1.299.822.822a3.5 3.5 0 0 1-4.474-4.474l.823.823a2.5 2.5 0 0 0 2.829 2.829z"/>
+    <path d="M3.35 5.47c-.18.16-.353.322-.518.487A13.134 13.134 0 0 0 1.172 8l.195.288c.335.48.83 1.12 1.465 1.755C4.121 11.332 5.881 12.5 8 12.5c.716 0 1.39-.133 2.02-.36l.77.772A7.029 7.029 0 0 1 8 13.5C3 13.5 0 8 0 8s.939-1.721 2.641-3.238l.708.709zm10.296 8.884-12-12 .708-.708 12 12-.708.708z"/>
+</svg>
diff --git a/src/adminui/templates/icons/eye.svg b/src/adminui/templates/icons/eye.svg
new file mode 100644
index 0000000..3be9488
--- /dev/null
+++ b/src/adminui/templates/icons/eye.svg
@@ -0,0 +1,4 @@
+<svg class="icon-show" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
+    <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
+    <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5z"/>
+</svg>
diff --git a/src/adminui/templates/macros.html b/src/adminui/templates/macros.html
new file mode 100644
index 0000000..8adf0c8
--- /dev/null
+++ b/src/adminui/templates/macros.html
@@ -0,0 +1,20 @@
+{% macro password_input(name, label="Password", placeholder="", error=None) %}
+<div class="mb-3">
+    <label class="form-label" for="{{ name }}">{{ label }}</label>
+    <div class="input-group">
+        <input type="password"
+               class="form-control password-input {% if error %}is-invalid{% endif %}"
+               name="{{ name }}"
+               id="{{ name }}"
+               placeholder="{{ placeholder }}"
+               {% if error %}aria-describedby="{{ name }}Feedback"{% endif %}>
+
+        <button class="btn password-toggle" type="button">
+            {% include "icons/eye.svg" %}
+            {% include "icons/eye-slash.svg" %}
+        </button>
+
+        {% if error %}<div id="{{ name }}Feedback" class="invalid-feedback">{{ error }}</div>{% endif %}
+    </div>
+</div>
+{% endmacro %}