diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java
index cac41f90f..6fb4fc235 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java
@@ -68,13 +68,14 @@ public class UserInfoEndpoint {
 			return "httpCodeView";
 		}
 		
-		if (!Strings.isNullOrEmpty(claimsRequestJsonString)) {
-			model.addAttribute("claimsRequest", claimsRequestJsonString);
-		}
-
 		model.addAttribute("scope", auth.getOAuth2Request().getScope());
-		model.addAttribute("requestObject", auth.getOAuth2Request().getExtensions().get("request"));
+		
+		model.addAttribute("authorizedClaims", auth.getOAuth2Request().getExtensions().get("claims"));
 
+		if (!Strings.isNullOrEmpty(claimsRequestJsonString)) {
+			model.addAttribute("requestedClaims", claimsRequestJsonString);
+		}
+		
 		model.addAttribute("userInfo", userInfo);
 
 		return "userInfoView";