diff --git a/static/js/login.js b/static/js/login.js
index 8143d276..2f115160 100644
--- a/static/js/login.js
+++ b/static/js/login.js
@@ -1,6 +1,10 @@
 $(function () {
     var passwordInput = $("#password-block input");
-    passwordInput.detach();
+
+    if ($("#password-block").hasClass("hide")) {
+       passwordInput.detach();
+    }
+
     $("#password-toggle").click(function() {
         $("#password-toggle").hide();
         $("#password-block").removeClass("hide");