diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index 079f7383..0bb24374 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -28,7 +28,7 @@
     </repositories>
 
     <properties>
-        <org.springframework.version>3.1.2.RELEASE</org.springframework.version>
+        <org.springframework.version>3.1.3.RELEASE</org.springframework.version>
     </properties>
 
     <dependencies>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/app.properties b/wise-webapp/src/main/webapp/WEB-INF/app.properties
index 76a47f6a..9dc15ca7 100755
--- a/wise-webapp/src/main/webapp/WEB-INF/app.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/app.properties
@@ -100,9 +100,15 @@ google.analytics.account=UA-XXXX
 google.ads.enabled=false
 
 #######################################################################################
-LDAP Configuration Section
+Security Configuration Section
 #######################################################################################
-security.ldap.enabled=false
+
+# Two type of security are supported:
+#   - db: User are stored in the database. Registration is required in advance.
+#   - ldap: Authentication takes place using a LDAP. In this case, security.ldap.* must be configured.
+security.type=db
+
+# LDAP Configuration properties.
 security.ldap.server=ldap://localhost:389
 security.ldap.server.user=cn=pveiga,dc=wisemapping,dc=com
 security.ldap.server.password=password
@@ -110,7 +116,6 @@ security.ldap.server.password=password
 security.ldap.basedn=dc=wisemapping,dc=com
 security.ldap.subDn=people
 security.ldap.auth.attribute=mail
-#######################################################################################
 
 
 
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-db.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-db.xml
index 7319eca1..76d22276 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-db.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-db.xml
@@ -8,6 +8,8 @@
           http://www.springframework.org/schema/security
           http://www.springframework.org/schema/security/spring-security-3.1.xsd">
 
+    <bean id="encoder" class="com.wisemapping.security.CustomPasswordEncoder"/>
+
     <sec:authentication-manager alias="authenticationManager">
         <sec:authentication-provider ref="dbAuthenticationProvider"/>
         <sec:authentication-provider user-service-ref="userDetailsService"/>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
index 12ad85b1..e4f46857 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
@@ -3,14 +3,14 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:sec="http://www.springframework.org/schema/security"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
           http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+          http://www.springframework.org/schema/context
+		  http://www.springframework.org/schema/context/spring-context-3.1.xsd
           http://www.springframework.org/schema/security
           http://www.springframework.org/schema/security/spring-security-3.1.xsd">
 
-    <bean id="encoder"
-          class="com.wisemapping.security.CustomPasswordEncoder"/>
-
     <sec:http pattern="/css/**" security="none"/>
     <sec:http pattern="/js/**" security="none"/>
     <sec:http pattern="/images/**" security="none"/>
@@ -56,8 +56,9 @@
         <sec:logout logout-url="/c/logout" invalidate-session="true" logout-success-url="/c/login"/>
     </sec:http>
 
-    <!--<import resource="wisemapping-security-db.xml"/>-->
-    <import resource="wisemapping-security-ldap.xml"/>
+    <!--<import resource="wisemapping-security-${security.type}.xml"/>-->
+    <import resource="wisemapping-security-db.xml"/>
+    <!--<import resource="wisemapping-security-ldap.xml"/>-->
 
     <bean id="userDetailsService" class="com.wisemapping.security.UserDetailsService">
         <property name="userService" ref="userService"/>