diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp
index 973517f168..de5458cdf7 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp
@@ -68,9 +68,11 @@ $(document).ready(function () {
 		register(event);
 	});
 	
-	$('#password').keyup(function(){
+	$(":password").keyup(function(){
 		if($("#password").val() != $("#matchPassword").val()){
 	        $("#globalError").show().html("Password mismatch");
+	    }else{
+	    	$("#globalError").html("").hide();
 	    }
 	});