diff --git a/samples/ldap-xml/ldap.gradle b/samples/ldap-xml/ldap.gradle
index 6ac6de254c..15285a396d 100644
--- a/samples/ldap-xml/ldap.gradle
+++ b/samples/ldap-xml/ldap.gradle
@@ -12,6 +12,8 @@ configurations {
 }
 
 dependencies {
+    compile project(':spring-security-taglibs'),
+            jstlDependencies
 
     runtime project(':spring-security-web'),
             project(':spring-security-config'),
diff --git a/samples/ldap-xml/src/main/webapp/secure/extreme/index.jsp b/samples/ldap-xml/src/main/webapp/secure/extreme/index.jsp
index 2804561673..be098912fb 100644
--- a/samples/ldap-xml/src/main/webapp/secure/extreme/index.jsp
+++ b/samples/ldap-xml/src/main/webapp/secure/extreme/index.jsp
@@ -1,3 +1,5 @@
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %>
 
 <html>
 <body>
@@ -5,6 +7,9 @@
 This is a protected page. You can only see me if you are a supervisor.
 
 <p><a href="../../">Home</a>
-<p><a href="../../j_spring_security_logout">Logout</a>
+<form action="<c:url value="/j_spring_security_logout"/>" method="post">
+<input type="submit" value="Logoff"/>
+<security:csrfInput/>
+</form>
 </body>
 </html>
\ No newline at end of file
diff --git a/samples/ldap-xml/src/main/webapp/secure/index.jsp b/samples/ldap-xml/src/main/webapp/secure/index.jsp
index 97d9b216d4..fc7c7254d7 100644
--- a/samples/ldap-xml/src/main/webapp/secure/index.jsp
+++ b/samples/ldap-xml/src/main/webapp/secure/index.jsp
@@ -1,4 +1,7 @@
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %>
 <html>
+<head><title>Secure Page</title></head>
 <body>
 <h1>Secure Page</h1>
 This is a protected page. You can get to me if you've been remembered,
@@ -10,6 +13,9 @@ or if you've authenticated this session.<br><br>
 
 
 <p><a href="../">Home</a>
-<p><a href="../j_spring_security_logout">Logout</a>
+<form action="<c:url value="/j_spring_security_logout"/>" method="post">
+<input type="submit" value="Logoff"/> (also clears any remember-me cookie)
+<security:csrfInput/>
+</form>
 </body>
 </html>
\ No newline at end of file
