diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/view/TokenIntrospectionView.java b/openid-connect-server/src/main/java/org/mitre/oauth2/view/TokenIntrospectionView.java
index 2c7b2922c..dedf3437c 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/view/TokenIntrospectionView.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/view/TokenIntrospectionView.java
@@ -95,12 +95,14 @@ public class TokenIntrospectionView extends AbstractView {
                 }
             	token.add("scope", scopes);
             	
-            	token.add("expires", context.serialize(src.getExpiration()));
+            	token.add("expires_at", context.serialize(src.getExpiration()));
             	
-            	token.addProperty("audience", src.getAuthenticationHolder().getAuthentication().getAuthorizationRequest().getClientId());
+            	//token.addProperty("audience", src.getAuthenticationHolder().getAuthentication().getAuthorizationRequest().getClientId());
             	
             	token.addProperty("subject", src.getAuthenticationHolder().getAuthentication().getName());
             	
+            	token.addProperty("client_id", src.getAuthenticationHolder().getAuthentication().getAuthorizationRequest().getClientId());
+            	
             	return token;
             }