diff --git a/web/templates/login.html b/web/templates/login.html
index f432dd0096..e67fdaa5af 100644
--- a/web/templates/login.html
+++ b/web/templates/login.html
@@ -2,7 +2,7 @@
 
 <div class="theme-panel">
   <h2 class="theme-heading">Log in to {{ issuer }} </h2>
-  <div>
+  <div id="providers">
     {{ range $c := .Connectors }}
       <div class="theme-form-row">
         <a href="{{ $c.URL }}" target="_self">
@@ -16,4 +16,13 @@ <h2 class="theme-heading">Log in to {{ issuer }} </h2>
   </div>
 </div>
 
+<script type="text/javascript">
+  if (window.location.hash) {
+    var buttons = document.querySelectorAll('#providers 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 3e1c2ed2da..64f612613f 100644
--- a/web/templates/password.html
+++ b/web/templates/password.html
@@ -38,6 +38,11 @@ <h2 class="theme-heading">Log in to Your Account</h2>
     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" . }}