diff --git a/spring-security-rest-custom/pom.xml b/spring-security-rest-custom/pom.xml
index 38cbfddab8..2180b917e5 100644
--- a/spring-security-rest-custom/pom.xml
+++ b/spring-security-rest-custom/pom.xml
@@ -26,6 +26,14 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.thymeleaf.extras</groupId>
+            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf-spring5</artifactId>
+        </dependency>
 
         <!-- Spring -->
 
diff --git a/spring-security-rest-custom/src/main/java/org/baeldung/config/child/WebConfig.java b/spring-security-rest-custom/src/main/java/org/baeldung/config/child/WebConfig.java
index 6688d41ffa..7cbbcf31fa 100644
--- a/spring-security-rest-custom/src/main/java/org/baeldung/config/child/WebConfig.java
+++ b/spring-security-rest-custom/src/main/java/org/baeldung/config/child/WebConfig.java
@@ -2,19 +2,34 @@ package org.baeldung.config.child;
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect;
+import org.thymeleaf.spring5.ISpringTemplateEngine;
+import org.thymeleaf.spring5.SpringTemplateEngine;
+import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
+import org.thymeleaf.spring5.view.ThymeleafViewResolver;
+import org.thymeleaf.templatemode.TemplateMode;
+import org.thymeleaf.templateresolver.ITemplateResolver;
 
 @Configuration
 @EnableWebMvc
 @ComponentScan("org.baeldung.web")
+//@ImportResource({ "classpath:prop.xml" })    
+//@PropertySource("classpath:foo.properties")
 public class WebConfig implements WebMvcConfigurer {
+    
+    @Autowired
+    private ApplicationContext applicationContext;
 
     public WebConfig() {
         super();
@@ -35,5 +50,31 @@ public class WebConfig implements WebMvcConfigurer {
         ppc.setIgnoreUnresolvablePlaceholders(true);
         return ppc;
     }
+    
+    @Bean
+    public ViewResolver viewResolver() {
+      ThymeleafViewResolver resolver = new ThymeleafViewResolver();
+      resolver.setTemplateEngine(templateEngine());
+      resolver.setCharacterEncoding("UTF-8");
+      return resolver;
+    }
+
+    @Bean
+    public ISpringTemplateEngine templateEngine() {
+      SpringTemplateEngine engine = new SpringTemplateEngine();
+      engine.setEnableSpringELCompiler(true);
+      engine.setTemplateResolver(templateResolver());
+      engine.addDialect(new SpringSecurityDialect());
+      return engine;
+    }
+
+    private ITemplateResolver templateResolver() {
+      SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver();
+      resolver.setApplicationContext(applicationContext);
+      resolver.setPrefix("/WEB-INF/templates/");
+      resolver.setSuffix(".html");
+      resolver.setTemplateMode(TemplateMode.HTML);
+      return resolver;
+    }
 
 }
\ No newline at end of file
diff --git a/spring-security-rest-custom/src/main/java/org/baeldung/config/parent/SecurityConfig.java b/spring-security-rest-custom/src/main/java/org/baeldung/config/parent/SecurityConfig.java
index 74e2df2174..fb3880a33f 100644
--- a/spring-security-rest-custom/src/main/java/org/baeldung/config/parent/SecurityConfig.java
+++ b/spring-security-rest-custom/src/main/java/org/baeldung/config/parent/SecurityConfig.java
@@ -10,6 +10,7 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
 @Configuration
+//@ImportResource({ "classpath:webSecurityConfig.xml" })
 @EnableWebSecurity
 @ComponentScan("org.baeldung.security")
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
diff --git a/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/ViewController.java b/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/ViewController.java
new file mode 100644
index 0000000000..83c0292d98
--- /dev/null
+++ b/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/ViewController.java
@@ -0,0 +1,13 @@
+package org.baeldung.web.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+public class ViewController {
+
+    @RequestMapping({ "/index", "/" })
+    public String index() {
+        return "index";
+    }
+}
diff --git a/spring-security-rest-custom/src/main/resources/prop.xml b/spring-security-rest-custom/src/main/resources/prop.xml
new file mode 100644
index 0000000000..edaecde655
--- /dev/null
+++ b/spring-security-rest-custom/src/main/resources/prop.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+   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.xsd
+      http://www.springframework.org/schema/context
+      http://www.springframework.org/schema/context/spring-context.xsd">
+ 
+      <context:property-placeholder location="classpath:foo.properties" />
+ 
+</beans>
\ No newline at end of file
diff --git a/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml b/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml
index fa5dc894bf..790b1b1716 100644
--- a/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml
+++ b/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml
@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
     xsi:schemaLocation="
         http://www.springframework.org/schema/security 
-        http://www.springframework.org/schema/security/spring-security-4.2.xsd
+        http://www.springframework.org/schema/security/spring-security.xsd
         http://www.springframework.org/schema/beans 
-        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"
+        http://www.springframework.org/schema/beans/spring-beans.xsd"
 >
 
     <http use-expressions="true">
diff --git a/spring-security-rest-custom/src/main/webapp/WEB-INF/templates/index.html b/spring-security-rest-custom/src/main/webapp/WEB-INF/templates/index.html
new file mode 100644
index 0000000000..31cb66ae0a
--- /dev/null
+++ b/spring-security-rest-custom/src/main/webapp/WEB-INF/templates/index.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html xmlns:th="https://www.thymeleaf.org" 
+      xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
+<body>
+	<div sec:authorize="isAuthenticated()">Authenticated as <span sec:authentication="name"></span></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-security-rest-custom/src/main/webapp/WEB-INF/web_old.xml b/spring-security-rest-custom/src/main/webapp/WEB-INF/web_old.xml
new file mode 100644
index 0000000000..0fa9abd258
--- /dev/null
+++ b/spring-security-rest-custom/src/main/webapp/WEB-INF/web_old.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+    xsi:schemaLocation="
+      http://java.sun.com/xml/ns/javaee
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
+>
+
+    <display-name>Spring Security Custom Application</display-name>
+
+    <!-- Spring root -->
+    <context-param>
+        <param-name>contextClass</param-name>
+        <param-value>
+         org.springframework.web.context.support.AnnotationConfigWebApplicationContext
+      </param-value>
+    </context-param>
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>org.baeldung.config.parent</param-value>
+    </context-param>
+
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
+
+    <!-- Spring child -->
+    <servlet>
+        <servlet-name>api</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <!-- <init-param> -->
+        <!-- <param-name>contextConfigLocation</param-name> -->
+        <!-- <param-value>org.baeldung.config.child</param-value> -->
+        <!-- </init-param> -->
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>api</servlet-name>
+        <url-pattern>/api/*</url-pattern>
+    </servlet-mapping>
+
+    <!-- Spring Security -->
+    <filter>
+        <filter-name>springSecurityFilterChain</filter-name>
+        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>springSecurityFilterChain</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+</web-app>
\ No newline at end of file