diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/UsersController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/UsersController.java
index 20f13c38..4a5de802 100644
--- a/wise-webapp/src/main/java/com/wisemapping/ncontroller/UsersController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/UsersController.java
@@ -52,9 +52,6 @@ public class UsersController {
     @Autowired
     private UserService userService;
 
-    @Value("${registration.email.enabled}")
-    boolean emailConfirmEnabled;
-
     @Autowired
     private ReCaptcha captchaService;
 
@@ -111,11 +108,13 @@ public class UsersController {
             user.setFirstname(userBean.getFirstname());
             user.setLastname(userBean.getLastname());
             user.setPassword(userBean.getPassword());
-            userService.createUser(user, emailConfirmEnabled);
+
+            boolean confirmRegistrationByEmail = false;
+            userService.createUser(user, confirmRegistrationByEmail);
 
             // Forward to the success view ...
             result = new ModelAndView("userRegistrationSuccess");
-            result.addObject("confirmByEmail", emailConfirmEnabled);
+            result.addObject("confirmByEmail", confirmRegistrationByEmail);
         }
         return result;
     }
diff --git a/wise-webapp/src/main/webapp/WEB-INF/app.properties b/wise-webapp/src/main/webapp/WEB-INF/app.properties
index 9dabbd69..e63aff27 100755
--- a/wise-webapp/src/main/webapp/WEB-INF/app.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/app.properties
@@ -9,6 +9,8 @@
 #database.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
 #database.username=wisemapping
 #database.password=password
+#database.validation.enabled=true
+#database.validation.query=SELECT 1
 
 # HSQL Configuration properties
 database.url=jdbc:hsqldb:file:target/db/wisemapping
@@ -16,6 +18,8 @@ database.driver=org.hsqldb.jdbc.JDBCDriver
 database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
 database.username=sa
 database.password=
+database.validation.enabled=false
+database.validation.query=
 
 ##################################################################################
 # Mail configuration. Must be configured to enable user registration confirmation.
@@ -60,9 +64,6 @@ mail.errorReporterEmail=
 # Users Registration  Configuration
 ##################################################################################
 
-# Enable/Disable user registration confirmation by e-mail. If it's enabled, mail must be configured.
-registration.email.enabled = false
-
 # Enable captcha confirmation
 google.recaptcha.enabled = true
 
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml
index 4936d3c3..871a472f 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml
@@ -1,74 +1,76 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans>
-    <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="location" value="/WEB-INF/app.properties" />
-    </bean>
-
-    <bean id="wiseDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-        <property name="driverClassName" value="${database.driver}"/>
-        <property name="url" value="${database.url}"/>
-        <property name="username" value="${database.username}"/>
-        <property name="password" value="${database.password}"/>
-    </bean>
-
-     <!--Descoment this lines for production environments -->
-    <!--<bean id="wiseDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">-->
-        <!--<property name="jndiName">-->
-            <!--<value>java:comp/env/jdbc/wisemapping</value>-->
-        <!--</property>-->
-    <!--</bean>-->
-
-    <bean id="mindmapSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-        <property name="dataSource" ref="wiseDataSource"/>
-        <property name="mappingResources">
-            <list>
-                <value>com/wisemapping/model/Collaborator.hbm.xml</value>
-                <value>com/wisemapping/model/Mindmap.hbm.xml</value>
-                <value>com/wisemapping/model/Collaboration.hbm.xml</value>
-                <value>com/wisemapping/model/CollaborationProperties.hbm.xml</value>
-                <value>com/wisemapping/model/AccessAuditory.hbm.xml</value>
-                <value>com/wisemapping/model/MindMapHistory.hbm.xml</value>
-            </list>
-        </property>
-        <property name="hibernateProperties">
-            <props>
-                <prop key="hibernate.dialect">${database.hibernate.dialect}</prop>
-            </props>
-        </property>
-    </bean>
-
-    <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
-        <property name="sessionFactory">
-            <ref local="mindmapSessionFactory"/>
-        </property>
-    </bean>
-
-    <!-- Spring Data Access Exception Translator Defintion -->
-    <bean id="jdbcExceptionTranslator" class="org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator">
-        <property name="dataSource" ref="wiseDataSource"/>
-    </bean>
-
-    <!-- Hibernate Template Defintion -->
-    <bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
-        <property name="sessionFactory" ref="mindmapSessionFactory"/>
-        <property name="jdbcExceptionTranslator" ref="jdbcExceptionTranslator"/>
-    </bean>
-
-    <bean id="txAttributes"
-          class="org.springframework.transaction.interceptor.NameMatchTransactionAttributeSource">
-        <property name="properties">
-            <props>
-                <prop key="*">PROPAGATION_REQUIRED</prop>
-            </props>
-        </property>
-    </bean>
-
-    <bean id="txInterceptor"
-          class="org.springframework.transaction.interceptor.TransactionInterceptor">
-        <property name="transactionManager" ref="transactionManager"/>
-        <property name="transactionAttributeSource" ref="txAttributes"/>
-    </bean>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+    <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="location" value="/WEB-INF/app.properties" />
+    </bean>
+
+    <bean id="wiseDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+        <property name="driverClassName" value="${database.driver}"/>
+        <property name="url" value="${database.url}"/>
+        <property name="username" value="${database.username}"/>
+        <property name="password" value="${database.password}"/>
+        <property name="testOnBorrow" value="${database.validation.enabled}"/>
+        <property name="validationQuery" value="${database.validation.query}"/>
+    </bean>
+
+     <!--Descoment this lines for production environments -->
+    <!--<bean id="wiseDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">-->
+        <!--<property name="jndiName">-->
+            <!--<value>java:comp/env/jdbc/wisemapping</value>-->
+        <!--</property>-->
+    <!--</bean>-->
+
+    <bean id="mindmapSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
+        <property name="dataSource" ref="wiseDataSource"/>
+        <property name="mappingResources">
+            <list>
+                <value>com/wisemapping/model/Collaborator.hbm.xml</value>
+                <value>com/wisemapping/model/Mindmap.hbm.xml</value>
+                <value>com/wisemapping/model/Collaboration.hbm.xml</value>
+                <value>com/wisemapping/model/CollaborationProperties.hbm.xml</value>
+                <value>com/wisemapping/model/AccessAuditory.hbm.xml</value>
+                <value>com/wisemapping/model/MindMapHistory.hbm.xml</value>
+            </list>
+        </property>
+        <property name="hibernateProperties">
+            <props>
+                <prop key="hibernate.dialect">${database.hibernate.dialect}</prop>
+            </props>
+        </property>
+    </bean>
+
+    <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
+        <property name="sessionFactory">
+            <ref local="mindmapSessionFactory"/>
+        </property>
+    </bean>
+
+    <!-- Spring Data Access Exception Translator Defintion -->
+    <bean id="jdbcExceptionTranslator" class="org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator">
+        <property name="dataSource" ref="wiseDataSource"/>
+    </bean>
+
+    <!-- Hibernate Template Defintion -->
+    <bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
+        <property name="sessionFactory" ref="mindmapSessionFactory"/>
+        <property name="jdbcExceptionTranslator" ref="jdbcExceptionTranslator"/>
+    </bean>
+
+    <bean id="txAttributes"
+          class="org.springframework.transaction.interceptor.NameMatchTransactionAttributeSource">
+        <property name="properties">
+            <props>
+                <prop key="*">PROPAGATION_REQUIRED</prop>
+            </props>
+        </property>
+    </bean>
+
+    <bean id="txInterceptor"
+          class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager" ref="transactionManager"/>
+        <property name="transactionAttributeSource" ref="txAttributes"/>
+    </bean>
+
+</beans>