diff --git a/php/public/forms.js b/php/public/forms.js
index 28c46a77..b3896469 100644
--- a/php/public/forms.js
+++ b/php/public/forms.js
@@ -39,6 +39,12 @@
     document.getElementById('overlay').classList.remove('loading');
   }
 
+  function mirrorPassword() {
+    var Password = document.getElementById("Password");
+    var mirroredPassword = document.getElementById("mirroredPassword");
+    mirroredPassword.innerText = Password.value;
+  }
+
   function initForm(form) {
     function submit(event)
     {
diff --git a/php/templates/login.twig b/php/templates/login.twig
index 5659c4db..674b8b2e 100644
--- a/php/templates/login.twig
+++ b/php/templates/login.twig
@@ -8,9 +8,10 @@
             {% if is_login_allowed == true %}
                 <p>Log in using your Nextcloud AIO password:</p>
                 <form method="POST" action="/api/auth/login" class="xhr">
-                    <input type="text" autocomplete="off" name="password" placeholder="Password" />
+                    <input name="password" placeholder="Password" autocomplete="on" type="password" wfd-id="id0" id="Password" oninput="mirrorPassword()">
                     <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
                     <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
+                    <a>Password: </a><a id="mirroredPassword"></a><br><br>
                     <input type="submit" class="button" value="Log in" />
                 </form>
             {% else %}