diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/registration/listener/RegistrationListener.java b/spring-security-login-and-registration/src/main/java/org/baeldung/registration/listener/RegistrationListener.java
index 48acab068e..0ec64ba408 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/registration/listener/RegistrationListener.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/registration/listener/RegistrationListener.java
@@ -41,7 +41,6 @@ public class RegistrationListener implements ApplicationListener<OnRegistrationC
         email.setTo(recipientAddress);
         email.setSubject(subject);
         email.setText(message + " \r\n" + "http://localhost:8080" + confirmationUrl);
-        System.out.println(email.getText());
         mailSender.send(email);
     }
 }
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java b/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java
index 5599db35e2..f59604b395 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java
@@ -130,7 +130,7 @@ public class RegistrationController {
             return "redirect:/emailError.html?lang=" + locale.getLanguage();
         } catch (final Exception e) {
             LOGGER.debug(e.getLocalizedMessage());
-            model.addAttribute("error", e.getLocalizedMessage());
+            model.addAttribute("message", e.getLocalizedMessage());
             return "redirect:/login.html?lang=" + locale.getLanguage();
         }
         model.addAttribute("message", messages.getMessage("message.resendToken", null, locale));
@@ -156,7 +156,7 @@ public class RegistrationController {
             return "redirect:/emailError.html?lang=" + request.getLocale().getLanguage();
         } catch (final Exception e) {
             LOGGER.debug(e.getLocalizedMessage());
-            model.addAttribute("error", e.getLocalizedMessage());
+            model.addAttribute("message", e.getLocalizedMessage());
             return "redirect:/login.html?lang=" + request.getLocale().getLanguage();
         }
         model.addAttribute("message", messages.getMessage("message.resetPassword", null, request.getLocale()));
@@ -230,4 +230,4 @@ public class RegistrationController {
         }
         return registered;
     }
-}
\ No newline at end of file
+}
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 2990489186..801042878b 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
@@ -54,7 +54,7 @@ NotEmpty.user.matchingPassword=Required
 PasswordMatches.user:Password does not match!
 Email.user.email=Invalid Username (Email)
 label.form.resendRegistrationToken=Re-send Token
-message.resendToken=We will send you a message with a new registration token to your email account.
+message.resendToken=We will send you a message with a new registration token to your email account
 message.forgetPassword=Forget Password
 message.resetPassword=Reset Password
 message.updatePassword=Update Password
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 54ed8f4edb..20d0d0332d 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
@@ -53,4 +53,9 @@ NotNull.user.matchingPassword=Campo obligatirio
 NotEmpty.user.matchingPassword=Campo obligatrio
 PasswordMatches.user:Las claves no coinciden!
 Email.user.email=Email no es valido
-label.form.resendRegistrationToken=Reenviar mensaje de emergencia
\ No newline at end of file
+label.form.resendRegistrationToken=Reenviar mensaje de emergencia
+message.resendToken=Le enviaremos un mensaje con un nuevo token de registro en su cuenta de correo electrónico
+message.forgetPassword=Olvide la contraseña
+message.resetPassword=Restablecer contraseña
+message.updatePassword=Actualizar contraseña
+message.userNotFound=Usuario no encontrado
\ 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 81cd03fd04..feed4754e9 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
@@ -56,6 +56,12 @@
 </script>
 </head>
 <body>
+<c:if test="${param.message != null}">
+<div class="alert alert-error">
+${param.message}
+</div>
+</c:if>
+
 	<div class="container">
 		<div class="span12">
 			<h1>