diff --git a/spring-security-login-and-registration/src/main/resources/messages_en.properties b/spring-security-login-and-registration/src/main/resources/messages_en.properties
index 74fd761c69..c522f1305f 100644
--- a/spring-security-login-and-registration/src/main/resources/messages_en.properties
+++ b/spring-security-login-and-registration/src/main/resources/messages_en.properties
@@ -69,4 +69,11 @@ message.updatePasswordSuc=Password updated successfully
 message.changePassword=Change Password
 message.invalidOldPassword=Invalid Old Password
 label.user.newPassword=New Password
-label.user.oldPassword=Old Password
\ No newline at end of file
+label.user.oldPassword=Old Password
+error.wordLength=Your password is too short
+error.wordNotEmail=Do not use your email as your password
+error.wordSequences=Your password contains sequences
+error.wordLowercase=Use lower case characters
+error.wordUppercase=Use upper case characters
+error.wordOneNumber=Use numbers
+error.wordOneSpecialChar=Use special characters
\ No newline at end of file
diff --git a/spring-security-login-and-registration/src/main/resources/messages_es_ES.properties b/spring-security-login-and-registration/src/main/resources/messages_es_ES.properties
index b6cef686ca..58ed951891 100644
--- a/spring-security-login-and-registration/src/main/resources/messages_es_ES.properties
+++ b/spring-security-login-and-registration/src/main/resources/messages_es_ES.properties
@@ -69,4 +69,11 @@ message.updatePasswordSuc=Contrase
 message.changePassword=Cambiar La Contraseña
 message.invalidOldPassword=Inválida contraseña antigua
 label.user.newPassword=Nueva Contraseña
-label.user.oldPassword=Contraseña Anterior
\ No newline at end of file
+label.user.oldPassword=Contraseña Anterior
+error.wordLength=Tu contraseña es demasiado corta
+error.wordNotEmail=No utilice su dirección de correo electrónico como contraseña
+error.wordSequences=Su contraseña contiene secuencias
+error.wordLowercase=Utilice caracteres en minúsculas
+error.wordUppercase=Utilice mayúsculas
+error.wordOneNumber=Utilice números
+error.wordOneSpecialChar=Utilice los caracteres especiales
\ No newline at end of file
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/login.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/login.jsp
index b0c82b7c99..d1be07060a 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/login.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/login.jsp
@@ -61,7 +61,7 @@
     }
 </script>
 <style type="text/css">
-.wrapper{width:400px;margin-left:auto;margin-right:auto}
+.wrapper{width:500px;margin-left:auto;margin-right:auto}
 label{padding-left:0 !important}
 </style>
 </head>
@@ -84,12 +84,12 @@ ${param.message}
             <form name='f' action="j_spring_security_check" method='POST'
                 onsubmit="return validate();">
                 
-                <label class="col-sm-2"><spring:message code="label.form.loginEmail"></spring:message></label>
-                <span class="col-sm-10"><input class="form-control" type='text' name='j_username' value=''></span>
+                <label class="col-sm-4"><spring:message code="label.form.loginEmail"></spring:message></label>
+                <span class="col-sm-8"><input class="form-control" type='text' name='j_username' value=''></span>
                 
                 <br><br>        
-                <label class="col-sm-2"><spring:message code="label.form.loginPass"></spring:message></label>
-                <span class="col-sm-10"><input class="form-control" type='password' name='j_password' /></span>
+                <label class="col-sm-4"><spring:message code="label.form.loginPass"></spring:message></label>
+                <span class="col-sm-8"><input class="form-control" type='password' name='j_password' /></span>
                 
                 <br><br>
                 <input class="btn btn-primary" name="submit" type="submit"
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 de5458cdf7..cf64291be6 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
@@ -70,7 +70,7 @@ $(document).ready(function () {
 	
 	$(":password").keyup(function(){
 		if($("#password").val() != $("#matchPassword").val()){
-	        $("#globalError").show().html("Password mismatch");
+	        $("#globalError").show().html('<spring:message code="PasswordMatches.user"></spring:message>');
 	    }else{
 	    	$("#globalError").html("").hide();
 	    }
@@ -82,13 +82,13 @@ $(document).ready(function () {
 		    	showVerdictsInsideProgressBar:true,
 		    	showErrors:true,
 		    	errorMessages:{
-		    		  wordLength: "Your password is too short",
-		    		  wordNotEmail: "Do not use your email as your password",
-		    		  wordSequences: "Your password contains sequences",
-		    		  wordLowercase: "Use lower case characters",
-		    		  wordUppercase: "Use upper case characters",
-		    	      wordOneNumber: "Use numbers",
-		    		  wordOneSpecialChar: "Use special characters"
+		    		  wordLength: '<spring:message code="error.wordLength"/>',
+		    		  wordNotEmail: '<spring:message code="error.wordNotEmail"/>',
+		    		  wordSequences: '<spring:message code="error.wordSequences"/>',
+		    		  wordLowercase: '<spring:message code="error.wordLowercase"/>',
+		    		  wordUppercase: '<spring:message code="error.wordUppercase"/>',
+		    	      wordOneNumber: '<spring:message code="error.wordOneNumber"/>',
+		    		  wordOneSpecialChar: '<spring:message code="error.wordOneSpecialChar"/>'
 		    		}
 		    	}
 		};
@@ -100,7 +100,7 @@ function register(event){
     $(".alert").html("").hide();
     $(".error-list").html("");
     if($("#password").val() != $("#matchPassword").val()){
-    	$("#globalError").show().html("Password mismatch");
+    	$("#globalError").show().html('<spring:message code="PasswordMatches.user"></spring:message>');
     	return;
     }
     var formData= $('form').serialize();