diff --git a/core/js/js.js b/core/js/js.js
index 90f1207780..89a20a529f 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -406,9 +406,9 @@ $(document).ready(function(){
 	$('#submit').hide();
 	$('#remember_login').hide();
 	$('#remember_login+label').hide();
-	$('#body-login input').keyup(function() {
+	$('input#user, input#password').keyup(function() {
 		var empty = false;
-		$('#body-login input').each(function() {
+		$('input#user, input#password').each(function() {
 			if ($(this).val() == '') {
 				empty = true;
 			}