diff --git a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
index 2f75780f98..8ea5676485 100644
--- a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
+++ b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
@@ -248,9 +248,10 @@ public final class AuthenticationHelper
       else
       {         
          // set last authentication username cookie value
-         if (loginBean != null)
+         String loginName;
+         if (loginBean != null && (loginName = loginBean.getUsernameInternal()) != null)
          {
-            setUsernameCookie(req, res, loginBean.getUsernameInternal());
+            setUsernameCookie(req, res, loginName);
          }
 
          // Set up the thread context