diff --git a/docs/guides/src/asciidoc/hellomvc.asc b/docs/guides/src/asciidoc/hellomvc.asc
index 79425d343e..0ef4d7f56e 100644
--- a/docs/guides/src/asciidoc/hellomvc.asc
+++ b/docs/guides/src/asciidoc/hellomvc.asc
@@ -80,16 +80,18 @@ include::hello-includes/exploring-the-secured-application.asc[]
 
 ==== Displaying the user name
 
-Now that we have authenticated, let's update the application to display the username. Update main.jsp to contain the following snippet:
+Now that we have authenticated, let's update the application to display the username if the user is authenticated. Update main.jsp to contain the following snippet:
 
 .src/main/webapp/WEB-INF/decorators/main.jsp
 [source,html]
 [subs="verbatim,quotes"]
 ----
 <div class="nav-collapse collapse">
-  *<p class="navbar-text pull-right">
-    <c:out value="${pageContext.request.remoteUser}"/>
-  </p>*
+  *<c:if test="${pageContext.request.remoteUser != null}">
+    <p class="navbar-text pull-right">
+      <c:out value="${pageContext.request.remoteUser}"/>
+    </p>
+  </c:if>*
   <ul class="nav">
     <c:url var="inboxUrl" value="/"/>
     <li><a href="${inboxUrl}">Inbox</a></li>
@@ -112,10 +114,12 @@ Now that we can view the user name, let's update the application to allow loggin
 [subs="verbatim,quotes"]
 ----
 <div class="nav-collapse collapse">
-  *<c:url var="logoutUrl" value="/logout"/>
-  <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post">
-    <input type="submit" value="Log out" />
-  </form:form>*
+  *<c:if test="${pageContext.request.remoteUser != null}">
+    <c:url var="logoutUrl" value="/logout"/>
+    <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post">
+      <input type="submit" value="Log out" />
+    </form:form>
+  </c:if>*
   <p class="navbar-text pull-right">
     <c:out value="${pageContext.request.remoteUser}"/>
   </p>
diff --git a/samples/concurrency-jc/src/main/webapp/WEB-INF/decorators/main.jsp b/samples/concurrency-jc/src/main/webapp/WEB-INF/decorators/main.jsp
index d35ae29086..29e25eb9d0 100644
--- a/samples/concurrency-jc/src/main/webapp/WEB-INF/decorators/main.jsp
+++ b/samples/concurrency-jc/src/main/webapp/WEB-INF/decorators/main.jsp
@@ -103,11 +103,13 @@
             <c:url var="logoUrl" value="/resources/img/logo.png"/>
             <a class="brand" href="${homeUrl}"><img src="${logoUrl}" alt="Spring Security Sample"/></a>
             <div class="nav-collapse collapse">
-              <c:url var="logoutUrl" value="/logout"/>
-              <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
-              <p class="navbar-text pull-right">
-                <c:out value="${pageContext.request.remoteUser}"/>
-              </p>
+              <c:if test="${pageContext.request.remoteUser != null}">
+                  <c:url var="logoutUrl" value="/logout"/>
+                  <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
+                  <p class="navbar-text pull-right">
+                    <c:out value="${pageContext.request.remoteUser}"/>
+                  </p>
+              </c:if>
               <ul class="nav">
                 <c:url var="inboxUrl" value="/"/>
                 <li><a href="${inboxUrl}">Inbox</a></li>
diff --git a/samples/hellomvc-jc/src/main/webapp/WEB-INF/decorators/main.jsp b/samples/hellomvc-jc/src/main/webapp/WEB-INF/decorators/main.jsp
index d35ae29086..29e25eb9d0 100644
--- a/samples/hellomvc-jc/src/main/webapp/WEB-INF/decorators/main.jsp
+++ b/samples/hellomvc-jc/src/main/webapp/WEB-INF/decorators/main.jsp
@@ -103,11 +103,13 @@
             <c:url var="logoUrl" value="/resources/img/logo.png"/>
             <a class="brand" href="${homeUrl}"><img src="${logoUrl}" alt="Spring Security Sample"/></a>
             <div class="nav-collapse collapse">
-              <c:url var="logoutUrl" value="/logout"/>
-              <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
-              <p class="navbar-text pull-right">
-                <c:out value="${pageContext.request.remoteUser}"/>
-              </p>
+              <c:if test="${pageContext.request.remoteUser != null}">
+                  <c:url var="logoutUrl" value="/logout"/>
+                  <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
+                  <p class="navbar-text pull-right">
+                    <c:out value="${pageContext.request.remoteUser}"/>
+                  </p>
+              </c:if>
               <ul class="nav">
                 <c:url var="inboxUrl" value="/"/>
                 <li><a href="${inboxUrl}">Inbox</a></li>
diff --git a/samples/inmemory-jc/src/main/webapp/WEB-INF/decorators/main.jsp b/samples/inmemory-jc/src/main/webapp/WEB-INF/decorators/main.jsp
index d35ae29086..29e25eb9d0 100644
--- a/samples/inmemory-jc/src/main/webapp/WEB-INF/decorators/main.jsp
+++ b/samples/inmemory-jc/src/main/webapp/WEB-INF/decorators/main.jsp
@@ -103,11 +103,13 @@
             <c:url var="logoUrl" value="/resources/img/logo.png"/>
             <a class="brand" href="${homeUrl}"><img src="${logoUrl}" alt="Spring Security Sample"/></a>
             <div class="nav-collapse collapse">
-              <c:url var="logoutUrl" value="/logout"/>
-              <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
-              <p class="navbar-text pull-right">
-                <c:out value="${pageContext.request.remoteUser}"/>
-              </p>
+              <c:if test="${pageContext.request.remoteUser != null}">
+                  <c:url var="logoutUrl" value="/logout"/>
+                  <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
+                  <p class="navbar-text pull-right">
+                    <c:out value="${pageContext.request.remoteUser}"/>
+                  </p>
+              </c:if>
               <ul class="nav">
                 <c:url var="inboxUrl" value="/"/>
                 <li><a href="${inboxUrl}">Inbox</a></li>
diff --git a/samples/insecuremvc/src/main/webapp/WEB-INF/decorators/main.jsp b/samples/insecuremvc/src/main/webapp/WEB-INF/decorators/main.jsp
index d35ae29086..29e25eb9d0 100644
--- a/samples/insecuremvc/src/main/webapp/WEB-INF/decorators/main.jsp
+++ b/samples/insecuremvc/src/main/webapp/WEB-INF/decorators/main.jsp
@@ -103,11 +103,13 @@
             <c:url var="logoUrl" value="/resources/img/logo.png"/>
             <a class="brand" href="${homeUrl}"><img src="${logoUrl}" alt="Spring Security Sample"/></a>
             <div class="nav-collapse collapse">
-              <c:url var="logoutUrl" value="/logout"/>
-              <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
-              <p class="navbar-text pull-right">
-                <c:out value="${pageContext.request.remoteUser}"/>
-              </p>
+              <c:if test="${pageContext.request.remoteUser != null}">
+                  <c:url var="logoutUrl" value="/logout"/>
+                  <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
+                  <p class="navbar-text pull-right">
+                    <c:out value="${pageContext.request.remoteUser}"/>
+                  </p>
+              </c:if>
               <ul class="nav">
                 <c:url var="inboxUrl" value="/"/>
                 <li><a href="${inboxUrl}">Inbox</a></li>
diff --git a/samples/jdbc-jc/src/main/webapp/WEB-INF/decorators/main.jsp b/samples/jdbc-jc/src/main/webapp/WEB-INF/decorators/main.jsp
index d35ae29086..29e25eb9d0 100644
--- a/samples/jdbc-jc/src/main/webapp/WEB-INF/decorators/main.jsp
+++ b/samples/jdbc-jc/src/main/webapp/WEB-INF/decorators/main.jsp
@@ -103,11 +103,13 @@
             <c:url var="logoUrl" value="/resources/img/logo.png"/>
             <a class="brand" href="${homeUrl}"><img src="${logoUrl}" alt="Spring Security Sample"/></a>
             <div class="nav-collapse collapse">
-              <c:url var="logoutUrl" value="/logout"/>
-              <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
-              <p class="navbar-text pull-right">
-                <c:out value="${pageContext.request.remoteUser}"/>
-              </p>
+              <c:if test="${pageContext.request.remoteUser != null}">
+                  <c:url var="logoutUrl" value="/logout"/>
+                  <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
+                  <p class="navbar-text pull-right">
+                    <c:out value="${pageContext.request.remoteUser}"/>
+                  </p>
+              </c:if>
               <ul class="nav">
                 <c:url var="inboxUrl" value="/"/>
                 <li><a href="${inboxUrl}">Inbox</a></li>
diff --git a/samples/ldap-jc/src/main/webapp/WEB-INF/decorators/main.jsp b/samples/ldap-jc/src/main/webapp/WEB-INF/decorators/main.jsp
index d35ae29086..29e25eb9d0 100644
--- a/samples/ldap-jc/src/main/webapp/WEB-INF/decorators/main.jsp
+++ b/samples/ldap-jc/src/main/webapp/WEB-INF/decorators/main.jsp
@@ -103,11 +103,13 @@
             <c:url var="logoUrl" value="/resources/img/logo.png"/>
             <a class="brand" href="${homeUrl}"><img src="${logoUrl}" alt="Spring Security Sample"/></a>
             <div class="nav-collapse collapse">
-              <c:url var="logoutUrl" value="/logout"/>
-              <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
-              <p class="navbar-text pull-right">
-                <c:out value="${pageContext.request.remoteUser}"/>
-              </p>
+              <c:if test="${pageContext.request.remoteUser != null}">
+                  <c:url var="logoutUrl" value="/logout"/>
+                  <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
+                  <p class="navbar-text pull-right">
+                    <c:out value="${pageContext.request.remoteUser}"/>
+                  </p>
+              </c:if>
               <ul class="nav">
                 <c:url var="inboxUrl" value="/"/>
                 <li><a href="${inboxUrl}">Inbox</a></li>
diff --git a/samples/openid-jc/src/main/webapp/WEB-INF/decorators/main.jsp b/samples/openid-jc/src/main/webapp/WEB-INF/decorators/main.jsp
index 8d6469da2b..29e25eb9d0 100644
--- a/samples/openid-jc/src/main/webapp/WEB-INF/decorators/main.jsp
+++ b/samples/openid-jc/src/main/webapp/WEB-INF/decorators/main.jsp
@@ -86,7 +86,6 @@
     <!--[if lt IE 9]>
       <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
-    <decorator:head/>
   </head>
 
 
@@ -104,18 +103,18 @@
             <c:url var="logoUrl" value="/resources/img/logo.png"/>
             <a class="brand" href="${homeUrl}"><img src="${logoUrl}" alt="Spring Security Sample"/></a>
             <div class="nav-collapse collapse">
-              <c:url var="logoutUrl" value="/logout"/>
-              <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
-              <p class="navbar-text pull-right">
-                <c:out value="${pageContext.request.remoteUser}"/>
-              </p>
+              <c:if test="${pageContext.request.remoteUser != null}">
+                  <c:url var="logoutUrl" value="/logout"/>
+                  <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
+                  <p class="navbar-text pull-right">
+                    <c:out value="${pageContext.request.remoteUser}"/>
+                  </p>
+              </c:if>
               <ul class="nav">
                 <c:url var="inboxUrl" value="/"/>
                 <li><a href="${inboxUrl}">Inbox</a></li>
                 <c:url var="composeUrl" value="/?form"/>
                 <li><a href="${composeUrl}">Compose</a></li>
-                <c:url var="userUrl" value="/user/"/>
-                <li><a href="${userUrl}">User</a></li>
               </ul>
             </div>
           </div>
diff --git a/samples/preauth-jc/src/main/webapp/WEB-INF/decorators/main.jsp b/samples/preauth-jc/src/main/webapp/WEB-INF/decorators/main.jsp
index d35ae29086..29e25eb9d0 100644
--- a/samples/preauth-jc/src/main/webapp/WEB-INF/decorators/main.jsp
+++ b/samples/preauth-jc/src/main/webapp/WEB-INF/decorators/main.jsp
@@ -103,11 +103,13 @@
             <c:url var="logoUrl" value="/resources/img/logo.png"/>
             <a class="brand" href="${homeUrl}"><img src="${logoUrl}" alt="Spring Security Sample"/></a>
             <div class="nav-collapse collapse">
-              <c:url var="logoutUrl" value="/logout"/>
-              <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
-              <p class="navbar-text pull-right">
-                <c:out value="${pageContext.request.remoteUser}"/>
-              </p>
+              <c:if test="${pageContext.request.remoteUser != null}">
+                  <c:url var="logoutUrl" value="/logout"/>
+                  <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
+                  <p class="navbar-text pull-right">
+                    <c:out value="${pageContext.request.remoteUser}"/>
+                  </p>
+              </c:if>
               <ul class="nav">
                 <c:url var="inboxUrl" value="/"/>
                 <li><a href="${inboxUrl}">Inbox</a></li>
diff --git a/samples/rememberme-jc/src/main/webapp/WEB-INF/decorators/main.jsp b/samples/rememberme-jc/src/main/webapp/WEB-INF/decorators/main.jsp
index d35ae29086..29e25eb9d0 100644
--- a/samples/rememberme-jc/src/main/webapp/WEB-INF/decorators/main.jsp
+++ b/samples/rememberme-jc/src/main/webapp/WEB-INF/decorators/main.jsp
@@ -103,11 +103,13 @@
             <c:url var="logoUrl" value="/resources/img/logo.png"/>
             <a class="brand" href="${homeUrl}"><img src="${logoUrl}" alt="Spring Security Sample"/></a>
             <div class="nav-collapse collapse">
-              <c:url var="logoutUrl" value="/logout"/>
-              <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
-              <p class="navbar-text pull-right">
-                <c:out value="${pageContext.request.remoteUser}"/>
-              </p>
+              <c:if test="${pageContext.request.remoteUser != null}">
+                  <c:url var="logoutUrl" value="/logout"/>
+                  <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
+                  <p class="navbar-text pull-right">
+                    <c:out value="${pageContext.request.remoteUser}"/>
+                  </p>
+              </c:if>
               <ul class="nav">
                 <c:url var="inboxUrl" value="/"/>
                 <li><a href="${inboxUrl}">Inbox</a></li>
diff --git a/samples/x509-jc/src/main/webapp/WEB-INF/decorators/main.jsp b/samples/x509-jc/src/main/webapp/WEB-INF/decorators/main.jsp
index d35ae29086..29e25eb9d0 100644
--- a/samples/x509-jc/src/main/webapp/WEB-INF/decorators/main.jsp
+++ b/samples/x509-jc/src/main/webapp/WEB-INF/decorators/main.jsp
@@ -103,11 +103,13 @@
             <c:url var="logoUrl" value="/resources/img/logo.png"/>
             <a class="brand" href="${homeUrl}"><img src="${logoUrl}" alt="Spring Security Sample"/></a>
             <div class="nav-collapse collapse">
-              <c:url var="logoutUrl" value="/logout"/>
-              <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
-              <p class="navbar-text pull-right">
-                <c:out value="${pageContext.request.remoteUser}"/>
-              </p>
+              <c:if test="${pageContext.request.remoteUser != null}">
+                  <c:url var="logoutUrl" value="/logout"/>
+                  <form:form class="navbar-form pull-right" action="${logoutUrl}" method="post"><input type="submit" value="Log out" /></form:form>
+                  <p class="navbar-text pull-right">
+                    <c:out value="${pageContext.request.remoteUser}"/>
+                  </p>
+              </c:if>
               <ul class="nav">
                 <c:url var="inboxUrl" value="/"/>
                 <li><a href="${inboxUrl}">Inbox</a></li>