diff --git a/web/templates/login.html b/web/templates/login.html
index f432dd00..69eec61f 100644
--- a/web/templates/login.html
+++ b/web/templates/login.html
@@ -16,4 +16,13 @@
   </div>
 </div>
 
+<script type="text/javascript">
+  if (window.location.hash) {
+    var buttons = document.querySelectorAll('div.theme-form-row a');
+    buttons.forEach(function(button) {
+      button.href = button.href + window.location.hash;
+    });
+  }
+</script>
+
 {{ template "footer.html" . }}
diff --git a/web/templates/password.html b/web/templates/password.html
index 3e1c2ed2..64f61261 100644
--- a/web/templates/password.html
+++ b/web/templates/password.html
@@ -38,6 +38,11 @@
     var el = document.querySelector('#submit-login');
     el.setAttribute('disabled', 'disabled');
   };
+
+  if (window.location.hash) {
+    var form = document.querySelector('form');
+    form.action = (form.action || '') + window.location.hash;
+  }
 </script>
 
 {{ template "footer.html" . }}