diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java b/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java
index 3fee2bb453..211ea95c1f 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java
@@ -63,10 +63,6 @@ public class RegistrationController {
         }
         User user = verificationToken.getUser();
         Calendar cal = Calendar.getInstance();
-        if (user == null) {
-            model.addAttribute("message", messages.getMessage("auth.message.invalidUser", null, request.getLocale()));
-            return "redirect:/badUser.html?lang=" + request.getLocale().getLanguage();
-        }
         if ((verificationToken.getExpiryDate().getTime() - cal.getTime().getTime()) <= 0) {
             user.setTokenExpired(true);
         }
diff --git a/spring-security-login-and-registration/src/main/resources/application.properties b/spring-security-login-and-registration/src/main/resources/application.properties
index 4948e3ebc4..baf7f37034 100644
--- a/spring-security-login-and-registration/src/main/resources/application.properties
+++ b/spring-security-login-and-registration/src/main/resources/application.properties
@@ -1,13 +1,13 @@
 ################### DataSource Configuration ##########################
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost:3306/spring_hibernate4_02?createDatabaseIfNotExist=true
-jdbc.user=tutorialuser
-jdbc.pass=tutorialmy5ql
+jdbc.url=jdbc:mysql://localhost:3306/AUTHDATA
+jdbc.user=root
+###jdbc.pass=admin###
 init-db=false
 ################### Hibernate Configuration ##########################
 hibernate.dialect=org.hibernate.dialect.MySQLDialect
-hibernate.show_sql=false
-hibernate.hbm2ddl.auto=create-drop
+hibernate.show_sql=true
+hibernate.hbm2ddl.auto=validate
 ################### JavaMail Configuration ##########################
 smtp.host=smtp.gmail.com
 smtp.port=465