diff --git a/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java b/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java
index 6b64afa4d2..612c73893a 100644
--- a/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java
+++ b/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java
@@ -107,8 +107,8 @@ public class SecurityContextHolderAwareRequestWrapper extends HttpServletRequest
 		if (auth.getPrincipal() instanceof UserDetails) {
 			return ((UserDetails) auth.getPrincipal()).getUsername();
 		}
-		if (auth.getPrincipal() instanceof AbstractAuthenticationToken) {
-			return ((AbstractAuthenticationToken) auth.getPrincipal()).getName();
+		if (auth instanceof AbstractAuthenticationToken) {
+			return auth.getName();
 		}
 		return auth.getPrincipal().toString();
 	}