From 5a3fc61d63e0e2a6cab1ff2ba6319f923e57b842 Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Wed, 1 Apr 2015 21:19:54 +0200
Subject: [PATCH 1/4] add change password

---
 .../persistence/service/IUserService.java     |  2 ++
 .../persistence/service/UserService.java      |  5 ++++
 .../java/org/baeldung/spring/MvcConfig.java   |  1 +
 .../controller/RegistrationController.java    | 15 +++++++++++-
 .../error/InvalidOldPasswordException.java    | 23 +++++++++++++++++++
 .../RestResponseEntityExceptionHandler.java   |  9 +++++++-
 .../src/main/resources/messages_en.properties |  7 +++++-
 .../main/resources/messages_es_ES.properties  |  7 +++++-
 8 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 spring-security-login-and-registration/src/main/java/org/baeldung/web/error/InvalidOldPasswordException.java

diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java
index 50466449a1..7ec07e9488 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java
@@ -32,4 +32,6 @@ public interface IUserService {
     User getUserByID(long id);
 
     void changeUserPassword(User user, String password);
+
+    boolean checkIfValidOldPassword(User user, String password);
 }
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java
index b9509f4f3a..fafe52953f 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java
@@ -120,6 +120,11 @@ public class UserService implements IUserService {
         repository.save(user);
     }
 
+    @Override
+    public boolean checkIfValidOldPassword(final User user, final String oldPassword) {
+        return passwordEncoder.matches(oldPassword, user.getPassword());
+    }
+
     private boolean emailExist(final String email) {
         final User user = repository.findByEmail(email);
         if (user != null) {
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java
index 30a7b31202..d5adf74992 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java
@@ -49,6 +49,7 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
         registry.addViewController("/successRegister.html");
         registry.addViewController("/forgetPassword.html");
         registry.addViewController("/updatePassword.html");
+        registry.addViewController("/changePassword.html");
     }
 
     @Override
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 10f2c64bc5..ab8d3feb66 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
@@ -14,6 +14,7 @@ import org.baeldung.persistence.service.IUserService;
 import org.baeldung.persistence.service.UserDto;
 import org.baeldung.registration.OnRegistrationCompleteEvent;
 import org.baeldung.validation.EmailExistsException;
+import org.baeldung.web.error.InvalidOldPasswordException;
 import org.baeldung.web.error.UserAlreadyExistException;
 import org.baeldung.web.error.UserNotFoundException;
 import org.baeldung.web.util.GenericResponse;
@@ -133,7 +134,6 @@ public class RegistrationController {
         final String appUrl = "http://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath();
         final SimpleMailMessage email = constructResetTokenEmail(appUrl, request.getLocale(), token, user);
         mailSender.send(email);
-
         return new GenericResponse(messages.getMessage("message.resetPasswordEmail", null, request.getLocale()));
     }
 
@@ -168,6 +168,19 @@ public class RegistrationController {
         return new GenericResponse(messages.getMessage("message.resetPasswordSuc", null, locale));
     }
 
+    // change user password
+
+    @RequestMapping(value = "/user/updatePassword", method = RequestMethod.POST)
+    @ResponseBody
+    public GenericResponse changeUserPassword(final Locale locale, @RequestParam("password") final String password, @RequestParam("oldpassword") final String oldPassword) {
+        final User user = userService.findUserByEmail(SecurityContextHolder.getContext().getAuthentication().getName());
+        if (!userService.checkIfValidOldPassword(user, oldPassword)) {
+            throw new InvalidOldPasswordException();
+        }
+        userService.changeUserPassword(user, password);
+        return new GenericResponse(messages.getMessage("message.updatePasswordSuc", null, locale));
+    }
+
     // NON-API
 
     private final SimpleMailMessage constructResendVerificationTokenEmail(final String contextPath, final Locale locale, final VerificationToken newToken, final User user) {
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/web/error/InvalidOldPasswordException.java b/spring-security-login-and-registration/src/main/java/org/baeldung/web/error/InvalidOldPasswordException.java
new file mode 100644
index 0000000000..74b4e04c1a
--- /dev/null
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/web/error/InvalidOldPasswordException.java
@@ -0,0 +1,23 @@
+package org.baeldung.web.error;
+
+public final class InvalidOldPasswordException extends RuntimeException {
+
+    private static final long serialVersionUID = 5861310537366287163L;
+
+    public InvalidOldPasswordException() {
+        super();
+    }
+
+    public InvalidOldPasswordException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+
+    public InvalidOldPasswordException(final String message) {
+        super(message);
+    }
+
+    public InvalidOldPasswordException(final Throwable cause) {
+        super(cause);
+    }
+
+}
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java b/spring-security-login-and-registration/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java
index 58c089a733..c74cf25c2b 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java
@@ -29,7 +29,7 @@ public class RestResponseEntityExceptionHandler extends ResponseEntityExceptionH
 
     // 400
     @Override
-    protected ResponseEntity<Object> handleBindException(BindException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+    protected ResponseEntity<Object> handleBindException(final BindException ex, final HttpHeaders headers, final HttpStatus status, final WebRequest request) {
         logger.error("400 Status Code", ex);
         final BindingResult result = ex.getBindingResult();
         final GenericResponse bodyOfResponse = new GenericResponse(result.getFieldErrors(), result.getGlobalErrors());
@@ -44,6 +44,13 @@ public class RestResponseEntityExceptionHandler extends ResponseEntityExceptionH
         return handleExceptionInternal(ex, bodyOfResponse, new HttpHeaders(), HttpStatus.BAD_REQUEST, request);
     }
 
+    @ExceptionHandler({ InvalidOldPasswordException.class })
+    public ResponseEntity<Object> handleInvalidOldPassword(final RuntimeException ex, final WebRequest request) {
+        logger.error("400 Status Code", ex);
+        final GenericResponse bodyOfResponse = new GenericResponse(messages.getMessage("message.invalidOldPassword", null, request.getLocale()), "InvalidOldEmail");
+        return handleExceptionInternal(ex, bodyOfResponse, new HttpHeaders(), HttpStatus.BAD_REQUEST, request);
+    }
+
     // 404
     @ExceptionHandler({ UserNotFoundException.class })
     public ResponseEntity<Object> handleUserNotFound(final RuntimeException ex, final WebRequest request) {
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 f3ad8d2307..74fd761c69 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
@@ -64,4 +64,9 @@ message.accountVerified=Your account verified successfully
 message.resetPasswordSuc=Password reset successfully
 message.resetYourPassword=Reset your password
 message.resetPasswordEmail=You should receive an Password Reset Email shortly
-message.error=Error Occurred
\ No newline at end of file
+message.error=Error Occurred
+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
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 0830f94336..b6cef686ca 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
@@ -64,4 +64,9 @@ message.accountVerified=Su cuenta verificada con 
 message.resetPasswordSuc=Contraseña reajusta correctamente
 message.resetYourPassword=Restablecer su contraseña
 message.resetPasswordEmail=Te enviaremos un correo electrónico para restablecer su contraseña
-message.error=Se produjo un error
\ No newline at end of file
+message.error=Se produjo un error
+message.updatePasswordSuc=Contraseña actualizado correctamente
+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

From 1bebb6354d30f4e4f6b4a0b9fad8a571b841bb6e Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Wed, 1 Apr 2015 21:20:45 +0200
Subject: [PATCH 2/4] add password validator

---
 .../pom.xml                                   |  8 ++++
 .../baeldung/persistence/service/UserDto.java | 14 +++----
 .../PasswordConstraintValidator.java          | 38 +++++++++++++++++++
 .../baeldung/validation/ValidPassword.java    | 27 +++++++++++++
 4 files changed, 80 insertions(+), 7 deletions(-)
 create mode 100644 spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordConstraintValidator.java
 create mode 100644 spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidPassword.java

diff --git a/spring-security-login-and-registration/pom.xml b/spring-security-login-and-registration/pom.xml
index 89ef8d571c..2f0988ea2d 100644
--- a/spring-security-login-and-registration/pom.xml
+++ b/spring-security-login-and-registration/pom.xml
@@ -67,6 +67,14 @@
 			<scope>test</scope>
 		</dependency>
 
+        <!-- Password Validation -->
+        <dependency>
+		    <groupId>org.passay</groupId>
+		    <artifactId>passay</artifactId>
+		    <version>1.0</version>
+		</dependency>
+        
+        
         <!-- Spring Data JPA dependencies -->
         <dependency>
             <groupId>org.springframework.data</groupId>
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java
index feaa3351e3..627aac81c4 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java
@@ -1,32 +1,32 @@
 package org.baeldung.persistence.service;
 
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 
 import org.baeldung.validation.PasswordMatches;
 import org.baeldung.validation.ValidEmail;
-import org.hibernate.validator.constraints.NotEmpty;
+import org.baeldung.validation.ValidPassword;
 
 @PasswordMatches
 public class UserDto {
     @NotNull
-    @NotEmpty
+    @Size(min = 1)
     private String firstName;
 
     @NotNull
-    @NotEmpty
+    @Size(min = 1)
     private String lastName;
 
-    @NotNull
-    @NotEmpty
+    @ValidPassword
     private String password;
 
     @NotNull
-    @NotEmpty
+    @Size(min = 1)
     private String matchingPassword;
 
     @ValidEmail
     @NotNull
-    @NotEmpty
+    @Size(min = 1)
     private String email;
 
     public String getEmail() {
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordConstraintValidator.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordConstraintValidator.java
new file mode 100644
index 0000000000..80d06a0f69
--- /dev/null
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordConstraintValidator.java
@@ -0,0 +1,38 @@
+package org.baeldung.validation;
+
+import java.util.Arrays;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import org.passay.DigitCharacterRule;
+import org.passay.LengthRule;
+import org.passay.PasswordData;
+import org.passay.PasswordValidator;
+import org.passay.RuleResult;
+import org.passay.SpecialCharacterRule;
+import org.passay.UppercaseCharacterRule;
+import org.passay.WhitespaceRule;
+
+import com.google.common.base.Joiner;
+
+public class PasswordConstraintValidator implements ConstraintValidator<ValidPassword, String> {
+
+    @Override
+    public void initialize(final ValidPassword arg0) {
+
+    }
+
+    @Override
+    public boolean isValid(final String password, final ConstraintValidatorContext context) {
+        final PasswordValidator validator = new PasswordValidator(Arrays.asList(new LengthRule(8, 30), new UppercaseCharacterRule(1), new DigitCharacterRule(1), new SpecialCharacterRule(1), new WhitespaceRule()));
+        final RuleResult result = validator.validate(new PasswordData(password));
+        if (result.isValid()) {
+            return true;
+        }
+        context.disableDefaultConstraintViolation();
+        context.buildConstraintViolationWithTemplate(Joiner.on("\n").join(validator.getMessages(result))).addConstraintViolation();
+        return false;
+    }
+
+}
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidPassword.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidPassword.java
new file mode 100644
index 0000000000..37b217213a
--- /dev/null
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidPassword.java
@@ -0,0 +1,27 @@
+package org.baeldung.validation;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+@Documented
+@Constraint(validatedBy = PasswordConstraintValidator.class)
+@Target({ TYPE, FIELD, ANNOTATION_TYPE })
+@Retention(RUNTIME)
+public @interface ValidPassword {
+
+    String message() default "Invalid Password";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+
+}

From 5ab6b9e6115594696959906134ce7878729aa2d3 Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Wed, 1 Apr 2015 21:21:03 +0200
Subject: [PATCH 3/4] add null check

---
 .../org/baeldung/security/AuthenticationFailureListener.java  | 4 +++-
 .../baeldung/security/AuthenticationSuccessEventListener.java | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationFailureListener.java b/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationFailureListener.java
index 3f1702defe..dc550d8c04 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationFailureListener.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationFailureListener.java
@@ -14,6 +14,8 @@ public class AuthenticationFailureListener implements ApplicationListener<Authen
 
     public void onApplicationEvent(AuthenticationFailureBadCredentialsEvent e) {
         WebAuthenticationDetails auth = (WebAuthenticationDetails) e.getAuthentication().getDetails();
-        loginAttemptService.loginFailed(auth.getRemoteAddress());
+        if (auth != null) {
+            loginAttemptService.loginFailed(auth.getRemoteAddress());
+        }
     }
 }
\ No newline at end of file
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationSuccessEventListener.java b/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationSuccessEventListener.java
index dff78ac0db..77a7b3ca6f 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationSuccessEventListener.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationSuccessEventListener.java
@@ -14,6 +14,8 @@ public class AuthenticationSuccessEventListener implements ApplicationListener<A
 
     public void onApplicationEvent(AuthenticationSuccessEvent e) {
         WebAuthenticationDetails auth = (WebAuthenticationDetails) e.getAuthentication().getDetails();
-        loginAttemptService.loginSucceeded(auth.getRemoteAddress());
+        if (auth != null) {
+            loginAttemptService.loginSucceeded(auth.getRemoteAddress());
+        }
     }
 }

From 2ebf9bea07e74e310b75f79c221c420e604b85c8 Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Wed, 1 Apr 2015 21:21:46 +0200
Subject: [PATCH 4/4] update ui

---
 .../src/main/webapp/WEB-INF/view/admin.jsp    |  43 ++---
 .../src/main/webapp/WEB-INF/view/badUser.jsp  |  22 +--
 .../webapp/WEB-INF/view/changePassword.jsp    |  72 +++++++++
 .../src/main/webapp/WEB-INF/view/console.jsp  |  51 +++---
 .../main/webapp/WEB-INF/view/emailError.jsp   |  18 +--
 .../webapp/WEB-INF/view/expiredAccount.jsp    |  13 +-
 .../webapp/WEB-INF/view/forgetPassword.jsp    |  33 ++--
 .../src/main/webapp/WEB-INF/view/home.jsp     |  27 ++--
 .../src/main/webapp/WEB-INF/view/homepage.jsp |  47 +++---
 .../webapp/WEB-INF/view/invalidSession.jsp    |  20 ++-
 .../src/main/webapp/WEB-INF/view/login.jsp    | 152 +++++++++---------
 .../src/main/webapp/WEB-INF/view/logout.jsp   |  31 ++--
 .../main/webapp/WEB-INF/view/registration.jsp |  14 ++
 .../WEB-INF/view/regitrationConfirm.jsp       |  11 +-
 .../webapp/WEB-INF/view/updatePassword.jsp    |  27 ++--
 .../src/main/webapp/resources/pwstrength.js   |   4 +
 16 files changed, 342 insertions(+), 243 deletions(-)
 create mode 100644 spring-security-login-and-registration/src/main/webapp/WEB-INF/view/changePassword.jsp
 create mode 100644 spring-security-login-and-registration/src/main/webapp/resources/pwstrength.js

diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/admin.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/admin.jsp
index b31fbaef45..db3d8f20ba 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/admin.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/admin.jsp
@@ -1,29 +1,34 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="sec"
-	uri="http://www.springframework.org/security/tags"%>
+    uri="http://www.springframework.org/security/tags"%>
 <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <html>
 
 <head>
-<link href="<c:url value="/resources/bootstrap.css" />" rel="stylesheet">
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
 <title><spring:message code="label.pages.home.title"></spring:message></title>
 </head>
 <body>
-	<div class="container">
-		<div class="span12">
-			<sec:authorize ifNotGranted="WRITE_PRIVILEGE">
-				<spring:message code="message.unauth"></spring:message>
-			</sec:authorize>
-			<sec:authorize ifAnyGranted="WRITE_PRIVILEGE">
-				<H1>
-					<spring:message code="label.pages.admin.message"></spring:message>
-				</H1>
-			</sec:authorize>
-			<a href="<c:url value="/j_spring_security_logout" />"><spring:message
-					code="label.pages.logout"></spring:message></a> <a
-				href="<c:url value="/home.html" />"><spring:message
-					code="label.pages.home.title"></spring:message></a>
-		</div>
-	</div>
+<nav class="navbar navbar-default">
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <a class="navbar-brand"href="<c:url value="/home.html" />"><spring:message code="label.pages.home.title"></spring:message></a>
+      </div>
+      <ul class="nav navbar-nav navbar-right">
+        <li><a href="<c:url value="/j_spring_security_logout" />"><spring:message code="label.pages.logout"></spring:message></a> </li>
+      </ul>
+    </div>
+</nav>
+
+    <div class="container">
+            <sec:authorize ifNotGranted="WRITE_PRIVILEGE">
+                <spring:message code="message.unauth"></spring:message>
+            </sec:authorize>
+            <sec:authorize ifAnyGranted="WRITE_PRIVILEGE">
+                <h1>
+                    <spring:message code="label.pages.admin.message"></spring:message>
+                </h1>
+            </sec:authorize>
+    </div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp
index e090c55e29..c2ad64ec6a 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp
@@ -1,38 +1,37 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib prefix="sec"
-	uri="http://www.springframework.org/security/tags"%>
+    uri="http://www.springframework.org/security/tags"%>
 <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <fmt:setBundle basename="messages" />
 <%@ page session="true"%>
 <html>
 <head>
-<link href="<c:url value="/resources/bootstrap.css" />" rel="stylesheet">
-	<title><spring:message
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+    <title><spring:message
 code="label.badUser.title"></spring:message></title>
 </head>
 <body>
-<h1>
-<div class="alert alert-error">
-				 ${param.message}
+<div class="container">
+<h1 class="alert alert-danger">
+                 ${param.message}
 </h1>
 <br>
-<a href="<c:url value="/registration.html" />"><spring:message
+<a class="btn btn-default" href="<c:url value="/registration.html" />"><spring:message
 code="label.form.loginSignUp"></spring:message></a>
 
 <c:if test="${param.expired}">
 <br>
 <h1>${label.form.resendRegistrationToken}</h1>
 <button onclick="resendToken()">
-	<spring:message code="label.form.resendRegistrationToken"></spring:message>
+    <spring:message code="label.form.resendRegistrationToken"></spring:message>
 </button>
 
-
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
 <script type="text/javascript">
 function resendToken(){
-	$.get("<c:url value="/user/resendRegistrationToken"><c:param name="token" value="${param.token}"/></c:url>", function(data){
-		window.location.href = "<c:url value="/login.html"></c:url>" + "?message=" + data.message;
+    $.get("<c:url value="/user/resendRegistrationToken"><c:param name="token" value="${param.token}"/></c:url>", function(data){
+        window.location.href = "<c:url value="/login.html"></c:url>" + "?message=" + data.message;
     })
     .fail(function(data) {
         if(data.responseJSON.error.indexOf("MailError") > -1)
@@ -50,5 +49,6 @@ $(document).ajaxStart(function() {
 });
 </script>
 </c:if>
+</div>
 </body>
 </html>
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/changePassword.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/changePassword.jsp
new file mode 100644
index 0000000000..21f4e52c23
--- /dev/null
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/changePassword.jsp
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<%@ page contentType="text/html;charset=UTF-8" language="java"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="sec"
+    uri="http://www.springframework.org/security/tags"%>
+<%@ page session="false"%>
+<html>
+<head>
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title><spring:message code="message.changePassword"></spring:message></title>
+</head>
+<body>
+<nav class="navbar navbar-default">
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <a class="navbar-brand"href="#"><spring:message code="label.pages.home.title"></spring:message></a>
+    </div>
+      <ul class="nav navbar-nav navbar-right">
+        <li><a href="<c:url value="/j_spring_security_logout" />"><spring:message code="label.pages.logout"></spring:message></a> </li>
+      </ul>
+    </div>
+</nav>
+    <div class="container">
+        <div class="row">
+        <div id="errormsg" class="alert alert-danger" style="display:none"></div>
+            <h1> <spring:message code="message.changePassword"></spring:message> </h1>
+            <div >
+                <br>
+                
+                    <label class="col-sm-2"><spring:message code="label.user.oldPassword"></spring:message></label>
+                    <span class="col-sm-5"><input class="form-control" id="oldpass" name="oldpassword" type="password" value="" /></span>
+                    <span class="col-sm-5"></span>
+<br><br>         
+                    <label class="col-sm-2"><spring:message code="label.user.newPassword"></spring:message></label>
+                    <span class="col-sm-5"><input class="form-control" id="pass" name="password" type="password" value="" /></span>
+                    <span class="col-sm-5"></span>
+<br><br>
+                    <label class="col-sm-2"><spring:message code="label.user.confirmPass"></spring:message></label>
+                    <span class="col-sm-5"><input class="form-control" id="passConfirm" type="password" value="" /></span>
+                    <span id="error" class="alert alert-danger" style="display:none"><spring:message code="PasswordMatches.user"></spring:message></span>
+                   
+                <br><br>
+                <button class="btn btn-primary" type="submit" onclick="savePass()">
+                    <spring:message code="message.changePassword"></spring:message>
+                </button>
+            </div>
+            
+        </div>
+    </div>
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+<script type="text/javascript">
+function savePass(){
+    var pass = $("#pass").val();
+    var valid = pass == $("#passConfirm").val();
+    if(!valid) {
+      $("#error").show();
+      return;
+    }
+    $.post("<c:url value="/user/updatePassword"></c:url>",{password: pass, oldpassword: $("#oldpass").val()} ,function(data){
+            window.location.href = "<c:url value="/console.html"></c:url>" + "?message="+data.message;
+    })
+    .fail(function(data) {
+    	$("#errormsg").show().html(data.responseJSON.message);
+    });
+}
+</script>    
+</body>
+
+</html>
\ No newline at end of file
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/console.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/console.jsp
index cd3146914d..1cf661af87 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/console.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/console.jsp
@@ -1,29 +1,42 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="sec"
-	uri="http://www.springframework.org/security/tags"%>
+    uri="http://www.springframework.org/security/tags"%>
 <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <html>
 <head>
-<link href="<c:url value="/resources/bootstrap.css" />" rel="stylesheet">
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
 </head>
 <body>
-	<div class="container">
-		<div class="span12">
-			<h1>This is the landing page for the admin</h1>
-			<sec:authorize access="hasRole('READ_PRIVILEGE')">
-		This text is only visible to a user
-		<br />
-			</sec:authorize>
-			<sec:authorize access="hasRole('WRITE_PRIVILEGE')">
-		This text is only visible to an admin
-		<br />
-			</sec:authorize>
-			<a href="<c:url value="/j_spring_security_logout" />"><spring:message
-					code="label.pages.logout"></spring:message></a> <a
-				href="<c:url value="/admin.html" />"><spring:message
-					code="label.pages.admin"></spring:message></a>
-		</div>
-	</div>
+<nav class="navbar navbar-default">
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <a class="navbar-brand"href="<c:url value="/home.html" />"><spring:message code="label.pages.home.title"></spring:message></a>
+    </div> 
+      <ul class="nav navbar-nav navbar-right">
+        <li><a href="<c:url value="/j_spring_security_logout" />"><spring:message code="label.pages.logout"></spring:message></a> </li>
+      </ul>
+    </div>
+</nav>
+
+    <div class="container">
+<c:if test="${param.message != null}">
+<div class="alert alert-info">
+${param.message}
+</div>
+</c:if>
+            <h1>This is the landing page for the admin</h1>
+            <sec:authorize access="hasRole('READ_PRIVILEGE')">
+        This text is only visible to a user
+        <br />
+            </sec:authorize>
+            <sec:authorize access="hasRole('WRITE_PRIVILEGE')">
+        This text is only visible to an admin
+        <br />
+            </sec:authorize>
+        <a class="btn btn-default" href="<c:url value="/changePassword.html" />"><spring:message code="message.changePassword"></spring:message></a>
+
+        <a class="btn btn-default" href="<c:url value="/admin.html" />"><spring:message code="label.pages.admin"></spring:message></a>
+    </div>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/emailError.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/emailError.jsp
index ca94dbdfb0..ed25d1f2cd 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/emailError.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/emailError.jsp
@@ -2,18 +2,16 @@
 <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <html>
 <head>
-<link href="<c:url value="/resources/bootstrap.css" />" rel="stylesheet">
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
 <title><spring:message code="label.pages.home.title"></spring:message></title>
 </head>
 <body>
-	<div class="container">
-		<div class="span12">
-			<h1 class="alert alert-error">
-				<spring:message code="message.email.config.error"></spring:message>
-			</h1>
-			
-		</div>
-	</div>
+    <div class="container">
+            <h1 class="alert alert-danger">
+                <spring:message code="message.email.config.error"></spring:message>
+            </h1>
+            
+    </div>
 </body>
 
-</html>
+</html>
\ No newline at end of file
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp
index 6d45aa3da4..e829daaa61 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib prefix="sec"
-	uri="http://www.springframework.org/security/tags"%>
+    uri="http://www.springframework.org/security/tags"%>
 <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <fmt:setBundle basename="messages" />
@@ -8,16 +8,17 @@
 
 <html>
 <head>
-<link href="<c:url value="/resources/bootstrap.css" />" rel="stylesheet">
-	<title><spring:message code="label.pages.home.title"></spring:message></title>
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+    <title><spring:message code="label.pages.home.title"></spring:message></title>
 </head>
 <body>
-<h1>
+<div class="container">
+<h1 class="alert alert-info">
   <spring:message code="auth.message.expired"></spring:message> 
 </h1>
 <br>
-<a href="<c:url value="/registration.html" />"><spring:message
+<a class="btn btn-default" href="<c:url value="registration.html" />"><spring:message
 code="label.form.loginSignUp"></spring:message></a>
-
+</div>
 </body>
 </html>
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp
index 7e7ee0c01f..cff325846d 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp
@@ -4,41 +4,30 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <%@ taglib prefix="sec"
-	uri="http://www.springframework.org/security/tags"%>
+    uri="http://www.springframework.org/security/tags"%>
 <%@ page session="false"%>
 <html>
 <head>
-<link href="<c:url value="/resources/bootstrap.css" />" rel="stylesheet">
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title><spring:message code="message.resetPassword"></spring:message></title>
 </head>
 <body>
 <div class="container">
-<div class="span12">
-<h1>
-<spring:message code="message.resetPassword"></spring:message>
-</h1>
-<div>
-<br>
-
-<tr>
-<td><label><spring:message code="label.user.email"></spring:message></label></td>
-<td><input id="email" name="email" type="email" value="" /></td>
-</tr>
-
-<button class="btn btn-primary" type="submit" onclick="resetPass()">
-<spring:message code="message.resetPassword"></spring:message>
-</button>
+    <h1><spring:message code="message.resetPassword"></spring:message></h1>
+    <br>
+<div class="row">
+        <label class="col-sm-1"><spring:message code="label.user.email"></spring:message></label>
+        <span class="col-sm-5"><input class="form-control" id="email" name="email" type="email" value="" /></span>
+        <button class="btn btn-primary" type="submit" onclick="resetPass()"><spring:message code="message.resetPassword"></spring:message></button>
 </div>
 
 <br> 
-<a href="<c:url value="/registration.html" />"><spring:message code="label.form.loginSignUp"></spring:message></a>
-<br>
-<a href="<c:url value="login.html" />"><spring:message code="label.form.loginLink"></spring:message></a>
+<a class="btn btn-default" href="<c:url value="registration.html" />"><spring:message code="label.form.loginSignUp"></spring:message></a>
+<br><br>
+<a class="btn btn-default" href="<c:url value="login.html" />"><spring:message code="label.form.loginLink"></spring:message></a>
 
 </div>
-</div>
-
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
 <script type="text/javascript">
 function resetPass(){
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/home.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/home.jsp
index 68819f09f4..f8db1632f6 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/home.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/home.jsp
@@ -4,19 +4,26 @@
 <html>
 
 <head>
-<link href="<c:url value="/resources/bootstrap.css" />" rel="stylesheet">
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
 <title><spring:message code="label.pages.home.title"></spring:message></title>
 </head>
 <body>
-	<div class="container">
-		<div class="span12">
-			<h1>
-				<spring:message code="label.pages.home.message"></spring:message>
-			</h1>
-			<a href="<c:url value="/j_spring_security_logout" />"><spring:message
-					code="label.pages.logout"></spring:message></a>
-		</div>
-	</div>
+<nav class="navbar navbar-default">
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <a class="navbar-brand"href="#"><spring:message code="label.pages.home.title"></spring:message></a>
+    </div>
+      <ul class="nav navbar-nav navbar-right">
+        <li><a href="<c:url value="/j_spring_security_logout" />"><spring:message code="label.pages.logout"></spring:message></a> </li>
+      </ul>
+    </div>
+</nav>
+    <div class="container">
+            <h1>
+                <spring:message code="label.pages.home.message"></spring:message>
+            </h1>
+    </div>
 </body>
 
 </html>
+
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/homepage.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/homepage.jsp
index 433de08b84..86cac0152f 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/homepage.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/homepage.jsp
@@ -1,35 +1,38 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="sec"
-	uri="http://www.springframework.org/security/tags"%>
+    uri="http://www.springframework.org/security/tags"%>
 <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ page session="true"%>
 <html>
 <head>
-<link href="<c:url value="/resources/bootstrap.css" />" rel="stylesheet">
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
 <title><spring:message code="label.pages.home.title"></spring:message></title>
 </head>
 <body>
+<nav class="navbar navbar-default">
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <a class="navbar-brand"href="<c:url value="/home.html" />"><spring:message code="label.pages.home.title"></spring:message></a>
+    </div>
+      <ul class="nav navbar-nav navbar-right">
+        <li><a href="<c:url value="/j_spring_security_logout" />"><spring:message code="label.pages.logout"></spring:message></a> </li>
+      </ul>
+    </div>
+</nav>
 
-	<div class="container">
-	
-		<div class="span12">
-			<sec:authorize access="hasRole('READ_PRIVILEGE')">
-				<spring:message code="label.pages.user.message"></spring:message>
-				<br />
-			</sec:authorize>
+    <div class="container">
+    
+            <sec:authorize access="hasRole('READ_PRIVILEGE')">
+                <spring:message code="label.pages.user.message"></spring:message>
+                <br />
+            </sec:authorize>
 
-			<sec:authorize access="hasRole('WRITE_PRIVILEGE')">
-				<spring:message code="label.pages.admin.message"></spring:message>
-				<br />
-			</sec:authorize>
-			 ${param.user}
-			<a href="<c:url value="/j_spring_security_logout" />"><spring:message
-					code="label.pages.logout"></spring:message></a> <a
-				href="<c:url value="/home.html" />"><spring:message
-					code="label.pages.home.title"></spring:message></a> <a
-				href="<c:url value="/admin.html" />"><spring:message
-					code="label.pages.admin"></spring:message></a>
-		</div>
-	</div>
+            <sec:authorize access="hasRole('WRITE_PRIVILEGE')">
+                <spring:message code="label.pages.admin.message"></spring:message>
+                <br />
+            </sec:authorize>
+             ${param.user}
+            <a class="btn btn-default" href="<c:url value="/admin.html" />"><spring:message code="label.pages.admin"></spring:message></a>
+    </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/invalidSession.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/invalidSession.jsp
index 4e62083a52..50891a216f 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/invalidSession.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/invalidSession.jsp
@@ -2,19 +2,17 @@
 <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <html>
 <head>
-<link href="<c:url value="/resources/bootstrap.css" />" rel="stylesheet">
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
 <title><spring:message code="label.pages.home.title"></spring:message></title>
 </head>
 <body>
-	<div class="container">
-		<div class="span12">
-			<h1 class="alert alert-error">
-				<spring:message code="message.sessionExpired"></spring:message>
-			</h1>
-			<a href="<c:url value="login.html" />"><spring:message
-					code="label.form.loginLink"></spring:message></a>
-		</div>
-	</div>
+    <div class="container">
+            <h1 class="alert alert-danger">
+                <spring:message code="message.sessionExpired"></spring:message>
+            </h1>
+            <a class="btn btn-primary" href="<c:url value="login.html" />"><spring:message
+                    code="label.form.loginLink"></spring:message></a>
+    </div>
 </body>
 
-</html>
+</html>
\ 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 a0611aed8b..b0c82b7c99 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
@@ -1,6 +1,6 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="sec"
-	uri="http://www.springframework.org/security/tags"%>
+    uri="http://www.springframework.org/security/tags"%>
 <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <fmt:setBundle basename="messages" />
@@ -8,58 +8,62 @@
 <fmt:message key="message.password" var="noPass" />
 <fmt:message key="message.username" var="noUser" />
 <c:if test="${param.error != null}">
-	<c:choose>
-		<c:when
-			test="${SPRING_SECURITY_LAST_EXCEPTION.message == 'User is disabled'}">
-			<div class="alert alert-error">
-				<spring:message code="auth.message.disabled"></spring:message>
-			</div>
-		</c:when>
-		<c:when
-			test="${SPRING_SECURITY_LAST_EXCEPTION.message == 'User account has expired'}">
-			<div class="alert alert-error">
-				<spring:message code="auth.message.expired"></spring:message>
-			</div>
-		</c:when>
-		<c:when
+    <c:choose>
+        <c:when
+            test="${SPRING_SECURITY_LAST_EXCEPTION.message == 'User is disabled'}">
+            <div class="alert alert-danger">
+                <spring:message code="auth.message.disabled"></spring:message>
+            </div>
+        </c:when>
+        <c:when
+            test="${SPRING_SECURITY_LAST_EXCEPTION.message == 'User account has expired'}">
+            <div class="alert alert-danger">
+                <spring:message code="auth.message.expired"></spring:message>
+            </div>
+        </c:when>
+        <c:when
             test="${SPRING_SECURITY_LAST_EXCEPTION.message == 'blocked'}">
-            <div class="alert alert-error">
+            <div class="alert alert-danger">
                <spring:message code="auth.message.blocked"></spring:message>
             </div>
         </c:when>
-		<c:otherwise>
-			<div class="alert alert-error">
-			<!-- <c:out value="${SPRING_SECURITY_LAST_EXCEPTION.message}"/> -->
-				<spring:message code="message.badCredentials"></spring:message>
-			</div>
-		</c:otherwise>
-	</c:choose>
+        <c:otherwise>
+            <div class="alert alert-danger">
+            <!-- <c:out value="${SPRING_SECURITY_LAST_EXCEPTION.message}"/> -->
+                <spring:message code="message.badCredentials"></spring:message>
+            </div>
+        </c:otherwise>
+    </c:choose>
 </c:if>
 <html>
 
 <head>
-<link href="<c:url value="/resources/bootstrap.css" />" rel="stylesheet">
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
 <title><spring:message code="label.pages.home.title"></spring:message></title>
 <script type="text/javascript">
-	function validate() {
-		if (document.f.j_username.value == ""
-				&& document.f.j_password.value == "") {
-			alert("${noUser} & ${noPass}");
-			document.f.j_username.focus();
-			return false;
-		}
-		if (document.f.j_username.value == "") {
-			alert("${noUser}");
-			document.f.j_username.focus();
-			return false;
-		}
-		if (document.f.j_password.value == "") {
-			alert("${noPass}");
-			document.f.j_password.focus();
-			return false;
-		}
-	}
+    function validate() {
+        if (document.f.j_username.value == ""
+                && document.f.j_password.value == "") {
+            alert("${noUser} & ${noPass}");
+            document.f.j_username.focus();
+            return false;
+        }
+        if (document.f.j_username.value == "") {
+            alert("${noUser}");
+            document.f.j_username.focus();
+            return false;
+        }
+        if (document.f.j_password.value == "") {
+            alert("${noPass}");
+            document.f.j_password.focus();
+            return false;
+        }
+    }
 </script>
+<style type="text/css">
+.wrapper{width:400px;margin-left:auto;margin-right:auto}
+label{padding-left:0 !important}
+</style>
 </head>
 <body>
 <c:if test="${param.message != null}">
@@ -68,42 +72,38 @@ ${param.message}
 </div>
 </c:if>
 
-	<div class="container">
-		<div class="span12">
-			<h1>
-				<spring:message code="label.form.loginTitle"></spring:message>
-			</h1>
-			<a href="?lang=en"><spring:message code="label.form.loginEnglish"></spring:message></a>
-			| <a href="?lang=es_ES"><spring:message
-					code="label.form.loginSpanish"></spring:message></a>
-			<form name='f' action="j_spring_security_check" method='POST'
-				onsubmit="return validate();">
-				<table>
-					<tr>
-						<td><label><spring:message
-									code="label.form.loginEmail"></spring:message></label></td>
-						<td><input type='text' name='j_username' value=''></td>
-					</tr>
-					<tr>
-						<td><label><spring:message
-									code="label.form.loginPass"></spring:message></label></td>
-						<td><input type='password' name='j_password' /></td>
-					</tr>
-					<tr>
-						<td><input class="btn btn-primary" name="submit" type="submit"
-							value=<spring:message code="label.form.submit"></spring:message> /></td>
-					</tr>
-				</table>
+    <div class="container">
+        <div class="row wrapper">
+            <h1>
+                <spring:message code="label.form.loginTitle"></spring:message>
+            </h1>
+            <a href="?lang=en"><spring:message code="label.form.loginEnglish"></spring:message></a>
+            | <a href="?lang=es_ES"><spring:message
+                    code="label.form.loginSpanish"></spring:message></a>
+            <br><br>
+            <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>
+                
+                <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>
+                
+                <br><br>
+                <input class="btn btn-primary" name="submit" type="submit"
+                            value=<spring:message code="label.form.submit"></spring:message> />
 
-			</form>
-			<br> Current Locale : ${pageContext.response.locale} <br> <a
-				href="<c:url value="/registration.html" />"><spring:message
-					code="label.form.loginSignUp"></spring:message></a>
-			<br><br><br>
-            <a href="<c:url value="/forgetPassword.html" />"><spring:message
+            </form>
+            <br> Current Locale : ${pageContext.response.locale} <br><br> 
+            <a class="btn btn-default" href="<c:url value="registration.html" />"><spring:message
+                    code="label.form.loginSignUp"></spring:message></a>
+            <br><br>
+            <a class="btn btn-default" href="<c:url value="/forgetPassword.html" />"><spring:message
               code="message.resetPassword"></spring:message></a>
-		</div>
-	</div>
+        </div>
+    </div>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/logout.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/logout.jsp
index b83c558577..284cdc6621 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/logout.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/logout.jsp
@@ -1,32 +1,31 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="sec"
-	uri="http://www.springframework.org/security/tags"%>
+    uri="http://www.springframework.org/security/tags"%>
 <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <html>
 
 <head>
-<link href="<c:url value="/resources/bootstrap.css" />" rel="stylesheet">
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
 <c:if test="${not empty SPRING_SECURITY_LAST_EXCEPTION}">
-	<div id="error">
-		<spring:message code="message.logoutError"></spring:message>
-	</div>
+    <h1 id="error" class="alert alert-danger">
+        <spring:message code="message.logoutError"></spring:message>
+    </h1>
 </c:if>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title><spring:message code="label.pages.home.title"></spring:message></title>
 </head>
 
 <body>
-	<div class="container">
-		<div class="span12">
-			<c:if test="${param.logSucc == true}">
-				<div id="success">
-					<spring:message code="message.logoutSucc"></spring:message>
-				</div>
-			</c:if>
-			<a href="<c:url value="login.html" />"><spring:message
-					code="label.form.loginLink"></spring:message></a>
-		</div>
-	</div>
+    <div class="container">
+           
+            <c:if test="${param.logSucc == true}">
+                <h1 id="success" class="alert alert-info">
+                    <spring:message code="message.logoutSucc"></spring:message>
+                </h1>
+            </c:if>
+            <a class="btn btn-primary" href="<c:url value="login.html" />"><spring:message
+                    code="label.form.loginLink"></spring:message></a>
+    </div>
 </body>
 
 </html>
\ No newline at end of file
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 34f51c2881..52f61ff93b 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
@@ -6,7 +6,13 @@
 <html>
 <head>
 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+<style>
+.password-verdict{
+color:#000;
+}
+</style>
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+<script src="<c:url value="/resources/pwstrength.js" />"></script>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title><spring:message code="label.form.title"></spring:message></title>
 </head>
@@ -57,6 +63,14 @@
     </div>
 
 <script type="text/javascript">
+$(document).ready(function () {
+	options = {
+		    common: {minChar:8},
+		    ui: {showVerdictsInsideProgressBar:true}
+		};
+	 $('#password').pwstrength(options);
+});
+
 function register(){
 	event.preventDefault();
     $(".alert").html("").hide();
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/regitrationConfirm.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/regitrationConfirm.jsp
index cdbeea5169..08d3f4ab70 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/regitrationConfirm.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/regitrationConfirm.jsp
@@ -1,6 +1,6 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="sec"
-	uri="http://www.springframework.org/security/tags"%>
+    uri="http://www.springframework.org/security/tags"%>
 <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <fmt:setBundle basename="messages" />
@@ -10,13 +10,14 @@
 </c:if>
 <html>
 <head>
-<link href="<c:url value="/resources/bootstrap.css" />" rel="stylesheet">
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title><spring:message code="label.pages.home.title"></spring:message></title>
 </head>
 <body>
-
-			<spring:message code="message.regSucc"></spring:message>
-			<a href="<c:url value="login.html" />"><spring:message code="label.login"></spring:message></a>
+<div>
+            <h1 class="alert alert-info"><spring:message code="message.regSucc"></spring:message></h1>
+            <a class="btn btn-primary" href="<c:url value="login.html" />"><spring:message code="label.login"></spring:message></a>
+</div>          
 </body>
 </html>
\ No newline at end of file
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/updatePassword.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/updatePassword.jsp
index cf2d515f71..859c0a9be4 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/updatePassword.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/updatePassword.jsp
@@ -8,31 +8,26 @@
 <%@ page session="false"%>
 <html>
 <head>
-<link href="<c:url value="/resources/bootstrap.css" />" rel="stylesheet">
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title><spring:message code="message.updatePassword"></spring:message></title>
 </head>
 <body>
 <sec:authorize access="hasRole('READ_PRIVILEGE')">
     <div class="container">
-        <div class="span12">
-            <H1>
-                <spring:message code="message.resetYourPassword"></spring:message>
-            </H1>
+        <div class="row">
+            <h1> <spring:message code="message.resetYourPassword"></spring:message> </h1>
             <div >
                 <br>
                 
-                <tr>
-                    <td><label><spring:message code="label.user.password"></spring:message></label></td>
-                    <td><input id="pass" name="password" type="password" value="" /></td>
-                </tr>
-                <tr>
-                    <td><label><spring:message code="label.user.confirmPass"></spring:message></label></td>
-                    <td>
-                        <input id="passConfirm" type="password" value="" />
-                        <span id="error" class="alert alert-error" style="display:none"><spring:message code="PasswordMatches.user"></spring:message></span>
-                    </td>
-                </tr>
+                    <label class="col-sm-2"><spring:message code="label.user.password"></spring:message></label>
+                    <span class="col-sm-5"><input class="form-control" id="pass" name="password" type="password" value="" /></span>
+                    <span class="col-sm-5"></span>
+<br><br>
+                    <label class="col-sm-2"><spring:message code="label.user.confirmPass"></spring:message></label>
+                    <span class="col-sm-5"><input class="form-control" id="passConfirm" type="password" value="" /></span>
+                    <span id="error" class="alert alert-danger" style="display:none"><spring:message code="PasswordMatches.user"></spring:message></span>
+                   
                 <br><br>
                 <button class="btn btn-primary" type="submit" onclick="savePass()">
                     <spring:message code="message.updatePassword"></spring:message>
diff --git a/spring-security-login-and-registration/src/main/webapp/resources/pwstrength.js b/spring-security-login-and-registration/src/main/webapp/resources/pwstrength.js
new file mode 100644
index 0000000000..0a08b4d065
--- /dev/null
+++ b/spring-security-login-and-registration/src/main/webapp/resources/pwstrength.js
@@ -0,0 +1,4 @@
+/* pwstrength-bootstrap 2015-02-07 - GPLv3 & MIT License */
+
+!function(a){var b={};try{if(!a&&module&&module.exports){var a=require("jquery"),c=require("jsdom").jsdom;a=a(c().parentWindow)}}catch(d){}!function(a,b){"use strict";var c={};b.forbiddenSequences=["0123456789","abcdefghijklmnopqrstuvwxyz","qwertyuiop","asdfghjkl","zxcvbnm","!@#$%^&*()_+"],c.wordNotEmail=function(a,b,c){return b.match(/^([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)$/i)?c:0},c.wordLength=function(a,b,c){var d=b.length,e=Math.pow(d,a.rules.raisePower);return d<a.common.minChar&&(e+=c),e},c.wordSimilarToUsername=function(b,c,d){var e=a(b.common.usernameField).val();return e&&c.toLowerCase().match(e.toLowerCase())?d:0},c.wordTwoCharacterClasses=function(a,b,c){return b.match(/([a-z].*[A-Z])|([A-Z].*[a-z])/)||b.match(/([a-zA-Z])/)&&b.match(/([0-9])/)||b.match(/(.[!,@,#,$,%,\^,&,*,?,_,~])/)&&b.match(/[a-zA-Z0-9_]/)?c:0},c.wordRepetitions=function(a,b,c){return b.match(/(.)\1\1/)?c:0},c.wordSequences=function(c,d,e){var f,g=!1;return d.length>2&&(a.each(b.forbiddenSequences,function(b,c){var e=[c,c.split("").reverse().join("")];a.each(e,function(a,b){for(f=0;f<d.length-2;f+=1)b.indexOf(d.toLowerCase().substring(f,f+3))>-1&&(g=!0)})}),g)?e:0},c.wordLowercase=function(a,b,c){return b.match(/[a-z]/)&&c},c.wordUppercase=function(a,b,c){return b.match(/[A-Z]/)&&c},c.wordOneNumber=function(a,b,c){return b.match(/\d+/)&&c},c.wordThreeNumbers=function(a,b,c){return b.match(/(.*[0-9].*[0-9].*[0-9])/)&&c},c.wordOneSpecialChar=function(a,b,c){return b.match(/[!,@,#,$,%,\^,&,*,?,_,~]/)&&c},c.wordTwoSpecialChar=function(a,b,c){return b.match(/(.*[!,@,#,$,%,\^,&,*,?,_,~].*[!,@,#,$,%,\^,&,*,?,_,~])/)&&c},c.wordUpperLowerCombo=function(a,b,c){return b.match(/([a-z].*[A-Z])|([A-Z].*[a-z])/)&&c},c.wordLetterNumberCombo=function(a,b,c){return b.match(/([a-zA-Z])/)&&b.match(/([0-9])/)&&c},c.wordLetterNumberCharCombo=function(a,b,c){return b.match(/([a-zA-Z0-9].*[!,@,#,$,%,\^,&,*,?,_,~])|([!,@,#,$,%,\^,&,*,?,_,~].*[a-zA-Z0-9])/)&&c},b.validation=c,b.executeRules=function(c,d){var e=0;return a.each(c.rules.activated,function(f,g){if(g){var h,i,j=c.rules.scores[f],k=b.validation[f];a.isFunction(k)||(k=c.rules.extra[f]),a.isFunction(k)&&(h=k(c,d,j),h&&(e+=h),(0>h||!a.isNumeric(h)&&!h)&&(i=c.ui.spanError(c,f),i.length>0&&c.instances.errors.push(i)))}}),e}}(a,b);try{module&&module.exports&&(module.exports=b)}catch(d){}var e={};e.common={},e.common.minChar=6,e.common.usernameField="#username",e.common.userInputs=[],e.common.onLoad=void 0,e.common.onKeyUp=void 0,e.common.zxcvbn=!1,e.common.zxcvbnTerms=[],e.common.debug=!1,e.rules={},e.rules.extra={},e.rules.scores={wordNotEmail:-100,wordLength:-50,wordSimilarToUsername:-100,wordSequences:-50,wordTwoCharacterClasses:2,wordRepetitions:-25,wordLowercase:1,wordUppercase:3,wordOneNumber:3,wordThreeNumbers:5,wordOneSpecialChar:3,wordTwoSpecialChar:5,wordUpperLowerCombo:2,wordLetterNumberCombo:2,wordLetterNumberCharCombo:2},e.rules.activated={wordNotEmail:!0,wordLength:!0,wordSimilarToUsername:!0,wordSequences:!0,wordTwoCharacterClasses:!1,wordRepetitions:!1,wordLowercase:!0,wordUppercase:!0,wordOneNumber:!0,wordThreeNumbers:!0,wordOneSpecialChar:!0,wordTwoSpecialChar:!0,wordUpperLowerCombo:!0,wordLetterNumberCombo:!0,wordLetterNumberCharCombo:!0},e.rules.raisePower=1.4,e.ui={},e.ui.bootstrap2=!1,e.ui.showProgressBar=!0,e.ui.showPopover=!1,e.ui.showStatus=!1,e.ui.spanError=function(a,b){"use strict";var c=a.ui.errorMessages[b];return c?'<span style="color: #d52929">'+c+"</span>":""},e.ui.popoverError=function(b){"use strict";var c="<div>Errors:<ul class='error-list' style='margin-bottom: 0;'>";return a.each(b,function(a,b){c+="<li>"+b+"</li>"}),c+="</ul></div>"},e.ui.errorMessages={wordLength:"Your password is too short",wordNotEmail:"Do not use your email as your password",wordSimilarToUsername:"Your password cannot contain your username",wordTwoCharacterClasses:"Use different character classes",wordRepetitions:"Too many repetitions",wordSequences:"Your password contains sequences"},e.ui.verdicts=["Weak","Normal","Medium","Strong","Very Strong"],e.ui.showVerdicts=!0,e.ui.showVerdictsInsideProgressBar=!1,e.ui.useVerdictCssClass=!1,e.ui.showErrors=!1,e.ui.container=void 0,e.ui.viewports={progress:void 0,verdict:void 0,errors:void 0},e.ui.scores=[14,26,38,50];var f={};!function(a,b){"use strict";var c=["danger","warning","success"],d=["error","warning","success"];b.getContainer=function(b,c){var d;return d=a(b.ui.container),d&&1===d.length||(d=c.parent()),d},b.findElement=function(a,b,c){return b?a.find(b).find(c):a.find(c)},b.getUIElements=function(a,c){var d,e;return a.instances.viewports?a.instances.viewports:(d=b.getContainer(a,c),e={},e.$progressbar=b.findElement(d,a.ui.viewports.progress,"div.progress"),a.ui.showVerdictsInsideProgressBar&&(e.$verdict=e.$progressbar.find("span.password-verdict")),a.ui.showPopover||(a.ui.showVerdictsInsideProgressBar||(e.$verdict=b.findElement(d,a.ui.viewports.verdict,"span.password-verdict")),e.$errors=b.findElement(d,a.ui.viewports.errors,"ul.error-list")),a.instances.viewports=e,e)},b.initProgressBar=function(c,d){var e=b.getContainer(c,d),f="<div class='progress'><div class='";c.ui.bootstrap2||(f+="progress-"),f+="bar'>",c.ui.showVerdictsInsideProgressBar&&(f+="<span class='password-verdict'></span>"),f+="</div></div>",c.ui.viewports.progress?e.find(c.ui.viewports.progress).append(f):a(f).insertAfter(d)},b.initHelper=function(c,d,e,f){var g=b.getContainer(c,d);f?g.find(f).append(e):a(e).insertAfter(d)},b.initVerdict=function(a,c){b.initHelper(a,c,"<span class='password-verdict'></span>",a.ui.viewports.verdict)},b.initErrorList=function(a,c){b.initHelper(a,c,"<ul class='error-list'></ul>",a.ui.viewports.errors)},b.initPopover=function(a,b){b.popover("destroy"),b.popover({html:!0,placement:"bottom",trigger:"manual",content:" "})},b.initUI=function(a,c){a.ui.showPopover?b.initPopover(a,c):(a.ui.showErrors&&b.initErrorList(a,c),a.ui.showVerdicts&&!a.ui.showVerdictsInsideProgressBar&&b.initVerdict(a,c)),a.ui.showProgressBar&&b.initProgressBar(a,c)},b.possibleProgressBarClasses=["danger","warning","success"],b.updateProgressBar=function(d,e,f,g){var h=b.getUIElements(d,e).$progressbar,i=h.find(".progress-bar"),j="progress-";d.ui.bootstrap2&&(i=h.find(".bar"),j=""),a.each(b.possibleProgressBarClasses,function(a,b){i.removeClass(j+"bar-"+b)}),i.addClass(j+"bar-"+c[f]),i.css("width",g+"%")},b.updateVerdict=function(a,d,e,f){var g=b.getUIElements(a,d).$verdict;g.removeClass(c.join(" ")),e>-1&&g.addClass(c[e]),g.html(f)},b.updateErrors=function(c,d){var e=b.getUIElements(c,d).$errors,f="";a.each(c.instances.errors,function(a,b){f+="<li>"+b+"</li>"}),e.html(f)},b.updatePopover=function(a,b,c){var d=b.data("bs.popover"),e="",f=!0;return a.ui.showVerdicts&&!a.ui.showVerdictsInsideProgressBar&&c.length>0&&(e="<h5><span class='password-verdict'>"+c+"</span></h5>",f=!1),a.ui.showErrors&&(a.instances.errors.length>0&&(f=!1),e+=a.ui.popoverError(a.instances.errors)),f?void b.popover("hide"):(a.ui.bootstrap2&&(d=b.data("popover")),void(d.$arrow&&d.$arrow.parents("body").length>0?b.find("+ .popover .popover-content").html(e):(d.options.content=e,b.popover("show"))))},b.updateFieldStatus=function(b,c,e){var f=b.ui.bootstrap2?".control-group":".form-group",g=c.parents(f).first();a.each(d,function(a,c){b.ui.bootstrap2||(c="has-"+c),g.removeClass(c)}),e=d[e],b.ui.bootstrap2||(e="has-"+e),g.addClass(e)},b.percentage=function(a,b){var c=Math.floor(100*a/b);return c=0>c?1:c,c=c>100?100:c},b.getVerdictAndCssClass=function(a,b){var c,d,e;return 0>=b?(c=0,e=-1,d=a.ui.verdicts[0]):b<a.ui.scores[0]?(c=0,e=0,d=a.ui.verdicts[0]):b<a.ui.scores[1]?(c=0,e=1,d=a.ui.verdicts[1]):b<a.ui.scores[2]?(c=1,e=2,d=a.ui.verdicts[2]):b<a.ui.scores[3]?(c=1,e=3,d=a.ui.verdicts[3]):(c=2,e=4,d=a.ui.verdicts[4]),[d,c,e]},b.updateUI=function(a,c,d){var e,f,g,h;e=b.getVerdictAndCssClass(a,d),g=0===d?"":e[0],e=e[1],h=a.ui.useVerdictCssClass?e:-1,a.ui.showProgressBar&&(f=b.percentage(d,a.ui.scores[3]),b.updateProgressBar(a,c,e,f),a.ui.showVerdictsInsideProgressBar&&b.updateVerdict(a,c,h,g)),a.ui.showStatus&&b.updateFieldStatus(a,c,e),a.ui.showPopover?b.updatePopover(a,c,g):(a.ui.showVerdicts&&!a.ui.showVerdictsInsideProgressBar&&b.updateVerdict(a,c,h,g),a.ui.showErrors&&b.updateErrors(a,c))}}(a,f);var g={};!function(a,c){"use strict";var d,g;d=function(c){var d,e,g,h,i=a(c.target),j=i.data("pwstrength-bootstrap"),k=i.val();void 0!==j&&(j.instances.errors=[],0===k.length?h=0:j.common.zxcvbn?(d=[],a.each(j.common.userInputs.concat([j.common.usernameField]),function(b,c){var e=a(c).val();e&&d.push(e)}),d=d.concat(j.common.zxcvbnTerms),h=zxcvbn(k,d).entropy):h=b.executeRules(j,k),f.updateUI(j,i,h),e=f.getVerdictAndCssClass(j,h),g=e[2],e=e[0],j.common.debug&&console.log(h+" - "+e),a.isFunction(j.common.onKeyUp)&&j.common.onKeyUp(c,{score:h,verdictText:e,verdictLevel:g}))},c.init=function(b){return this.each(function(c,g){var h=a.extend(!0,{},e),i=a.extend(!0,h,b),j=a(g);i.instances={},j.data("pwstrength-bootstrap",i),j.on("keyup",d),j.on("change",d),j.on("onpaste",d),f.initUI(i,j),a.trim(j.val())&&j.trigger("keyup"),a.isFunction(i.common.onLoad)&&i.common.onLoad()}),this},c.destroy=function(){this.each(function(b,c){var d=a(c),e=d.data("pwstrength-bootstrap"),g=f.getUIElements(e,d);g.$progressbar.remove(),g.$verdict.remove(),g.$errors.remove(),d.removeData("pwstrength-bootstrap")})},c.forceUpdate=function(){this.each(function(a,b){var c={target:b};d(c)})},c.addRule=function(b,c,d,e){this.each(function(f,g){var h=a(g).data("pwstrength-bootstrap");h.rules.activated[b]=e,h.rules.scores[b]=d,h.rules.extra[b]=c})},g=function(b,c,d){this.each(function(e,f){a(f).data("pwstrength-bootstrap").rules[c][b]=d})},c.changeScore=function(a,b){g.call(this,a,"scores",b)},c.ruleActive=function(a,b){g.call(this,a,"activated",b)},a.fn.pwstrength=function(b){var d;return c[b]?d=c[b].apply(this,Array.prototype.slice.call(arguments,1)):"object"!=typeof b&&b?a.error("Method "+b+" does not exist on jQuery.pwstrength-bootstrap"):d=c.init.apply(this,arguments),d}}(a,g)}(jQuery);
+//# sourceMappingURL=pwstrength-bootstrap-1.2.5.min.map
\ No newline at end of file