diff --git a/spring-boot/src/main/java/com/baeldung/dynamicvalidation/ContactInfoValidator.java b/spring-boot/src/main/java/com/baeldung/dynamicvalidation/ContactInfoValidator.java
index a8393e2739..53fb418ad6 100644
--- a/spring-boot/src/main/java/com/baeldung/dynamicvalidation/ContactInfoValidator.java
+++ b/spring-boot/src/main/java/com/baeldung/dynamicvalidation/ContactInfoValidator.java
@@ -6,6 +6,8 @@ import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.thymeleaf.util.StringUtils;
 
 import com.baeldung.dynamicvalidation.dao.ContactInfoExpressionRepository;
 import com.baeldung.dynamicvalidation.model.ContactInfoExpression;
@@ -15,17 +17,17 @@ public class ContactInfoValidator implements ConstraintValidator<ContactInfo, St
     @Autowired
     private ContactInfoExpressionRepository expressionRepository;
 
+    @Value("${contactInfoType}")
+    String expressionType;
+
     @Override
     public void initialize(final ContactInfo contactInfo) {
     }
 
     @Override
     public boolean isValid(final String value, final ConstraintValidatorContext context) {
-        String expressionType = System.getProperty("contactInfoType");
-        System.out.println(expressionType);
-        final ContactInfoExpression expression = expressionRepository.findOne(expressionType);
-        if (expression != null) {
-            final String pattern = expression.getPattern();
+        if (!StringUtils.isEmptyOrWhitespace(expressionType)) {
+            final String pattern = expressionRepository.findOne(expressionType).map(ContactInfoExpression::getPattern).orElse("");
             if (Pattern.matches(pattern, value))
                 return true;
         }
diff --git a/spring-boot/src/main/java/com/baeldung/dynamicvalidation/config/CustomerController.java b/spring-boot/src/main/java/com/baeldung/dynamicvalidation/config/CustomerController.java
index 44db2d5228..d1e6b845d7 100644
--- a/spring-boot/src/main/java/com/baeldung/dynamicvalidation/config/CustomerController.java
+++ b/spring-boot/src/main/java/com/baeldung/dynamicvalidation/config/CustomerController.java
@@ -10,21 +10,13 @@ import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.baeldung.dynamicvalidation.dao.ContactInfoExpressionRepository;
-import com.baeldung.dynamicvalidation.model.ContactInfoExpression;
 import com.baeldung.dynamicvalidation.model.Customer;
 
 @Controller
 public class CustomerController {
 
-    @Autowired
-    private ContactInfoExpressionRepository expressionRepository;
-
     @GetMapping("/customer")
     public String getCustomerPage(Model model) {
-        model.addAttribute("contactInfoType", System.getProperty("contactInfoType"));
         return "customer";
     }
 
@@ -35,20 +27,6 @@ public class CustomerController {
         } else {
             model.addAttribute("message", "The information is valid!");
         }
-        model.addAttribute("contactInfoType", System.getProperty("contactInfoType"));
         return "customer";
     }
-
-    @PostMapping("/updateContactInfoType")
-    @ResponseBody
-    public void updateContactInfoType(@RequestParam final String type) {
-        System.setProperty("contactInfoType", type);
-    }
-
-    @GetMapping("/contactInfoTypes")
-    @ResponseBody
-    public List<ContactInfoExpression> getContactInfoType(Model model) {
-        return expressionRepository.findAll();
-    }
-
 }
diff --git a/spring-boot/src/main/java/com/baeldung/dynamicvalidation/dao/ContactInfoExpressionRepository.java b/spring-boot/src/main/java/com/baeldung/dynamicvalidation/dao/ContactInfoExpressionRepository.java
index ccacc297a5..0d7797b996 100644
--- a/spring-boot/src/main/java/com/baeldung/dynamicvalidation/dao/ContactInfoExpressionRepository.java
+++ b/spring-boot/src/main/java/com/baeldung/dynamicvalidation/dao/ContactInfoExpressionRepository.java
@@ -1,9 +1,11 @@
 package com.baeldung.dynamicvalidation.dao;
 
-import org.springframework.data.jpa.repository.JpaRepository;
+import java.util.Optional;
+
+import org.springframework.data.repository.Repository;
 
 import com.baeldung.dynamicvalidation.model.ContactInfoExpression;
 
-public interface ContactInfoExpressionRepository extends JpaRepository<ContactInfoExpression, String> {
-
+public interface ContactInfoExpressionRepository extends Repository<ContactInfoExpression, String> {
+    Optional<ContactInfoExpression> findOne(String id);
 }
diff --git a/spring-boot/src/main/resources/application.properties b/spring-boot/src/main/resources/application.properties
index 84315a2477..444f68d50a 100644
--- a/spring-boot/src/main/resources/application.properties
+++ b/spring-boot/src/main/resources/application.properties
@@ -43,4 +43,6 @@ servlet.mapping=/dispatcherExampleURL
 #banner.image.width= //TODO
 #banner.image.height= //TODO
 #banner.image.margin= //TODO
-#banner.image.invert= //TODO
\ No newline at end of file
+#banner.image.invert= //TODO
+
+contactInfoType=email
\ No newline at end of file
diff --git a/spring-boot/src/main/resources/templates/customer.html b/spring-boot/src/main/resources/templates/customer.html
index 6aec5ab590..c8f5a25d5e 100644
--- a/spring-boot/src/main/resources/templates/customer.html
+++ b/spring-boot/src/main/resources/templates/customer.html
@@ -3,39 +3,14 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>Customer Page</title>
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.0/jquery.min.js"></script>
-<script>
-$(document).ready(function() {
-    $.ajax({
-        url: "contactInfoTypes"
-    }).done(function(data) {
-        var contactInfoType = $('#contactInfoType').text();
-        $.each(data,function(key, value) {
-            var o = new Option(value.type, value.type);
-            if (value.type == contactInfoType) {
-        	    o.selected = true;
-            }
-            $('#expressions').append(o);
-        });
-    });
-    $('#expressions').change(function(){
-        $.ajax({
-            url: "updateContactInfoType",
-            method:'POST',
-            data:{type:$('#expressions').val()}
-        });
-    });
-});
-</script>
 </head>
 <body>
 <br />
 <form action="customer" method="POST">
 Contact Info: <input type="text" name="contactInfo" /> <br />
-Contact Info Type: <select id="expressions" ></select> <br />
 <input type="submit" value="Submit" />
 </form>
 <br /><br />
 <span th:text="${message}"></span><br />
-<span id="contactInfoType" th:text="${contactInfoType}" style="visibility:hidden"></span><br />
 </body>
 </html>
\ No newline at end of file