--- a/server/src/main/webapp/WEB-INF/applicationContext.xml	Fri Oct 25 16:34:05 2013 +0200
+++ b/server/src/main/webapp/WEB-INF/applicationContext.xml	Mon Oct 28 18:20:56 2013 +0100
@@ -51,6 +51,9 @@
 	
 	<!-- Configures the annotation-driven Spring MVC Controller programming model.
 	Note that, with Spring 3.0, this tag works in Servlet MVC only!  -->
+    <bean class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder" id="renkanPasswordEncoder" name="renkanPasswordEncoder" scope="prototype">
+        <constructor-arg name="strength" value="10" type="int"/>
+    </bean>
 
     <!-- Loads MongoDB configuraton -->
     <import resource="mongo-config.xml"/>
@@ -68,7 +71,6 @@
      For example @Controller and @Service. Make sure to set the correct base-package-->
     <context:component-scan base-package="org.iri_research.renkan.rest" />
     <context:component-scan base-package="org.iri_research.renkan.coweb" />
-    <context:component-scan base-package="org.iri_research.renkan.forms" />
     <context:component-scan base-package="org.iri_research.renkan.management" />
     
     <!--mvc:annotation-driven>