diff -r 793eece3691e -r e65766f81b15 server/src/main/webapp/WEB-INF/spring-security.xml
--- a/server/src/main/webapp/WEB-INF/spring-security.xml	Mon Nov 04 15:56:44 2013 +0100
+++ b/server/src/main/webapp/WEB-INF/spring-security.xml	Thu Nov 07 10:42:18 2013 +0100
@@ -28,7 +28,12 @@
         <property name="ignoreUnresolvablePlaceholders" value="true"/>
         <property name="IgnoreResourceNotFound" value="true"/>
     </bean>
+
+    <bean class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder" id="renkanPasswordEncoder">
+        <constructor-arg name="strength" value="10" type="int"/>
+    </bean>
     
+    <bean class="org.iri_research.renkan.services.RenkanUserDetailsService" id="renkanUserDetailsService" />
  
     <security:http auto-config="true" use-expressions="true">
         <security:intercept-url pattern="/admin" access="hasRole('ROLE_ADMIN')" />
@@ -38,12 +43,21 @@
     </security:http>
  
     <security:authentication-manager>
-	    <security:authentication-provider>
-	        <security:password-encoder hash="sha-256"/>
+        <security:authentication-provider>
+            <security:password-encoder hash="sha-256"/>
             <security:user-service>
                 <security:user name="${user.admin.name}" password="${user.admin.password}" authorities="ROLE_ADMIN, ROLE_USER"/>
-		    </security:user-service>
-	    </security:authentication-provider>
+            </security:user-service>
+        </security:authentication-provider>
+        <security:authentication-provider user-service-ref='renkanUserDetailsService'>
+            <security:password-encoder ref="renkanPasswordEncoder" />
+        </security:authentication-provider>
     </security:authentication-manager>
+    <!--security:authentication-manager>
+        <security:authentication-provider user-service-ref='renkanUserDetailsService'>
+            <security:password-encoder ref="renkanPasswordEncoder" />
+        </security:authentication-provider>
+    </security:authentication-manager-->
+
  
 </beans>
\ No newline at end of file