Index: .idea/sonarIssues.xml
===================================================================
diff -u -r9c682bfffc7a711c4653d1816a3e218913fd149f -rf65a84df30dda9e661e4b0af84b8f65311d94551
--- .idea/sonarIssues.xml	(.../sonarIssues.xml)	(revision 9c682bfffc7a711c4653d1816a3e218913fd149f)
+++ .idea/sonarIssues.xml	(.../sonarIssues.xml)	(revision f65a84df30dda9e661e4b0af84b8f65311d94551)
@@ -1828,6 +1828,16 @@
             <set />
           </value>
         </entry>
+        <entry key="$PROJECT_DIR$/standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/service/LocalUserDetailService.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/service/RegistrationUserDetailService.java">
+          <value>
+            <set />
+          </value>
+        </entry>
         <entry key="$PROJECT_DIR$/standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/util/SecurityUtil.java">
           <value>
             <set />
Index: standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/service/LocalUserDetailService.java
===================================================================
diff -u -r64d16c3d9ac985cb7a19b8e9f38236ae765711eb -rf65a84df30dda9e661e4b0af84b8f65311d94551
--- standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/service/LocalUserDetailService.java	(.../LocalUserDetailService.java)	(revision 64d16c3d9ac985cb7a19b8e9f38236ae765711eb)
+++ standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/service/LocalUserDetailService.java	(.../LocalUserDetailService.java)	(revision f65a84df30dda9e661e4b0af84b8f65311d94551)
@@ -1,25 +1,20 @@
 package egovframework.com.ext.jstree.support.security.service;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import egovframework.com.ext.jstree.support.security.database.dao.UserDAO;
+import egovframework.com.ext.jstree.support.security.database.model.Role;
+import egovframework.com.ext.jstree.support.security.database.model.User;
+import egovframework.com.ext.jstree.support.security.dto.LocalUser;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.encoding.ShaPasswordEncoder;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import egovframework.com.ext.jstree.support.security.database.dao.UserDAO;
-import egovframework.com.ext.jstree.support.security.database.model.Role;
-import egovframework.com.ext.jstree.support.security.database.model.User;
-import egovframework.com.ext.jstree.support.security.dto.LocalUser;
+import java.util.ArrayList;
+import java.util.List;
 
-
-/**
- * @author <a href="mailto:psunil1278@gmail.com">Sunil Kumar</a>
- * @since 26/12/15
- */
 @Service("localUserDetailService")
 public class LocalUserDetailService implements UserDetailsService {
 
Index: standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/service/RegistrationUserDetailService.java
===================================================================
diff -u -r64d16c3d9ac985cb7a19b8e9f38236ae765711eb -rf65a84df30dda9e661e4b0af84b8f65311d94551
--- standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/service/RegistrationUserDetailService.java	(.../RegistrationUserDetailService.java)	(revision 64d16c3d9ac985cb7a19b8e9f38236ae765711eb)
+++ standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/service/RegistrationUserDetailService.java	(.../RegistrationUserDetailService.java)	(revision f65a84df30dda9e661e4b0af84b8f65311d94551)
@@ -1,21 +1,20 @@
 package egovframework.com.ext.jstree.support.security.service;
 
-import java.util.HashSet;
-
-import egovframework.com.ext.jstree.support.security.service.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import egovframework.com.ext.jstree.support.security.database.dao.UserDAO;
 import egovframework.com.ext.jstree.support.security.database.model.Role;
 import egovframework.com.ext.jstree.support.security.database.model.User;
 import egovframework.com.ext.jstree.support.security.dto.LocalUser;
 import egovframework.com.ext.jstree.support.security.dto.UserRegistrationForm;
 import egovframework.com.ext.jstree.support.security.exception.UserAlreadyExistAuthenticationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashSet;
+
 /**
  * @author <a href="mailto:sunil.pulugula@wavemaker.com">Sunil Kumar</a>
  * @since 28/3/16
@@ -30,7 +29,10 @@
     @Autowired
     private UserDAO userDAO;
 
+    @Autowired
+    private BCryptPasswordEncoder passwordEncoder;
 
+
     @Override
     @Transactional(value = "transactionManager")
     public LocalUser registerNewUser(final UserRegistrationForm userRegistrationForm) throws UserAlreadyExistAuthenticationException {
@@ -52,7 +54,7 @@
         user.setUserId(formDTO.getUserId());
         user.setEmailId(formDTO.getEmail());
         user.setName(formDTO.getFirstName());
-        user.setPassword(formDTO.getPassword());
+        user.setPassword(passwordEncoder.encode(formDTO.getPassword()));
         final HashSet<Role> roles = new HashSet<Role>();
         Role role = new Role();
         role.setName("ROLE_USER");
Index: standard/project/web/src/main/resources/egovframework/spring/com/context-security.xml
===================================================================
diff -u -r3bda0a83ee4a2f1a10e14435080f6b2ebb30ad72 -rf65a84df30dda9e661e4b0af84b8f65311d94551
--- standard/project/web/src/main/resources/egovframework/spring/com/context-security.xml	(.../context-security.xml)	(revision 3bda0a83ee4a2f1a10e14435080f6b2ebb30ad72)
+++ standard/project/web/src/main/resources/egovframework/spring/com/context-security.xml	(.../context-security.xml)	(revision f65a84df30dda9e661e4b0af84b8f65311d94551)
@@ -6,18 +6,23 @@
                     http://www.springframework.org/schema/security
                     http://www.springframework.org/schema/security/spring-security.xsd">
 
-
 	<!--  authentication manager and its provider( social provider deals with social login & local user provider deals with form login ) -->
 	<security:authentication-manager alias="authenticationManager">
 		<security:authentication-provider ref="socialAuthenticationProvider"/>
-		<security:authentication-provider user-service-ref="localUserDetailService"/>
+		<security:authentication-provider user-service-ref="localUserDetailService">
+			<security:password-encoder ref="passwordEncoder">
+			</security:password-encoder>
+		</security:authentication-provider>
 	</security:authentication-manager>
 
 	<bean id="socialAuthenticationProvider" class="org.springframework.social.security.SocialAuthenticationProvider">
 		<constructor-arg ref="inMemoryUsersConnectionRepository"/>
 		<constructor-arg ref="socialUserDetailService"/>
 	</bean>
 
+	<bean id="passwordEncoder" class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder">
+	</bean>
+
 	<!-- form login beans -->
 	<bean id="appAuthenticationEntryPoint" class="egovframework.com.ext.jstree.support.security.entrypoint.AppAuthenticationEntryPoint">
 		<constructor-arg name="loginFormUrl" value="/services/login"/>
@@ -56,7 +61,7 @@
 		<security:csrf/>
 
 		<security:intercept-url pattern="/api/rivalWar/ROLE_USER/**" access="hasRole('ROLE_USER')" />
-		<security:intercept-url pattern="/api/rivalWar/ROLE_ADMIN/**" access="hasRole('ROLE_ADMIN')" />
+		<security:intercept-url pattern="/api/rivalWar/ROLE_ADMIN/**" access="hasAnyRole('ROLE_USER','ROLE_ADMIN')" />
 
 		<security:intercept-url pattern="/auth/**" access="permitAll"/>
 		<security:intercept-url pattern="/j_spring_security_check" access="permitAll"/>
@@ -79,7 +84,6 @@
 		<property name="authenticationSuccessHandler" ref="successHandler"/>
 	</bean>
 
-
 	<!-- inmemory connection repository which holds connection repository per local user -->
 	<bean id="inMemoryUsersConnectionRepository"
 		  class="org.springframework.social.connect.mem.InMemoryUsersConnectionRepository">