diff --git a/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java b/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java
index dcef86a3..04ab63c9 100644
--- a/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java
+++ b/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java
@@ -156,7 +156,7 @@ final public class NotificationService {
             model.put("userAgent", userAgent);
 
             final String errorReporterEmail = mailer.getErrorReporterEmail();
-            if (errorReporterEmail != null) {
+            if (errorReporterEmail != null && !errorReporterEmail.isEmpty()) {
                 mailer.sendEmail(mailer.getServerSenderEmail(), errorReporterEmail, "[WiseMapping] Editor error from " + user.getEmail(), model,
                         "editorErrorReport.vm");
             }
@@ -174,7 +174,7 @@ final public class NotificationService {
             model.put("userAgent", userAgent);
 
             final String errorReporterEmail = mailer.getErrorReporterEmail();
-            if (errorReporterEmail != null) {
+            if (errorReporterEmail != null && !errorReporterEmail.isEmpty()) {
                 mailer.sendEmail(mailer.getServerSenderEmail(), errorReporterEmail, "[WiseMapping] Export error from " + user.getEmail(), model,
                         "editorErrorReport.vm");
             }
diff --git a/wise-webapp/src/main/webapp/WEB-INF/app.properties b/wise-webapp/src/main/webapp/WEB-INF/app.properties
index 4dac9e34..010e87a1 100755
--- a/wise-webapp/src/main/webapp/WEB-INF/app.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/app.properties
@@ -3,18 +3,18 @@
 ##################################################################################
 
 # MySQL 5.X configuration properties
-database.url=jdbc:mysql://localhost/wisemapping
-database.driver=com.mysql.jdbc.Driver
-database.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
-database.username=wisemapping
-database.password=password
+#database.url=jdbc:mysql://localhost/wisemapping
+#database.driver=com.mysql.jdbc.Driver
+#database.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+#database.username=wisemapping
+#database.password=password
 
 # HSQL Configuration properties
-#database.url=jdbc:hsqldb:file:target/db/wisemapping
-#database.driver=org.hsqldb.jdbc.JDBCDriver
-#database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
-#database.username=sa
-#database.password=
+database.url=jdbc:hsqldb:file:target/db/wisemapping
+database.driver=org.hsqldb.jdbc.JDBCDriver
+database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
+database.username=sa
+database.password=
 
 
 ##################################################################################
@@ -51,7 +51,7 @@ mail.serverSendEmail=root@localhost
 mail.supportEmail=root@localhost
 
 # Optional: Unexpected error will be reported to this address.
-mail.errorReporterEmail=root@localhost
+mail.errorReporterEmail=
 
 ##################################################################################
 # Users Registration  Configuration
diff --git a/wise-webapp/src/test/sql/hsql/drop-schemas.sql b/wise-webapp/src/test/sql/hsql/drop-schemas.sql
index 2c3416c1..e91e8e84 100644
--- a/wise-webapp/src/test/sql/hsql/drop-schemas.sql
+++ b/wise-webapp/src/test/sql/hsql/drop-schemas.sql
@@ -1,3 +1,4 @@
+DROP TABLE ACCESS_AUDITORY;
 DROP TABLE TAG;
 DROP TABLE COLLABORATION;
 DROP TABLE COLLABORATION_PROPERTIES;
@@ -5,6 +6,5 @@ DROP TABLE MINDMAP_HISTORY;
 DROP TABLE MINDMAP;
 DROP TABLE USER;
 DROP TABLE COLLABORATOR;
-DROP TABLE USER_LOGIN;
 COMMIT;
 SHUTDOWN;
\ No newline at end of file
diff --git a/wise-webapp/src/test/sql/mysql/drop-schemas.sql b/wise-webapp/src/test/sql/mysql/drop-schemas.sql
index 862cc003..a6bfa760 100644
--- a/wise-webapp/src/test/sql/mysql/drop-schemas.sql
+++ b/wise-webapp/src/test/sql/mysql/drop-schemas.sql
@@ -1,9 +1,9 @@
 DROP TABLE TAG;
+DROP TABLE ACCESS_AUDITORY;
 DROP TABLE COLLABORATION;
 DROP TABLE COLLABORATION_PROPERTIES;
 DROP TABLE MINDMAP_HISTORY;
 DROP TABLE MINDMAP;
 DROP TABLE USER;
 DROP TABLE COLLABORATOR;
-DROP TABLE USER_LOGIN;
 COMMIT;
\ No newline at end of file