diff --git a/frontend/js/commento.js b/frontend/js/commento.js
index 16610c72..f868d323 100644
--- a/frontend/js/commento.js
+++ b/frontend/js/commento.js
@@ -1250,7 +1250,10 @@
       append(loginBox, fieldContainer);
     }
 
-    $(ID_LOGIN_BOX_PASSWORD_INPUT).focus();
+    if (loginBoxType == "signup")
+      $(ID_LOGIN_BOX_PASSWORD_NAME).focus();
+    else
+      $(ID_LOGIN_BOX_PASSWORD_INPUT).focus();
   }