diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java
index 303e86a1..dbcd2a70 100644
--- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java
+++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java
@@ -42,6 +42,7 @@ public class OAuthDefaultUserInfoAdapter extends AbstractAuthorizeAdapter {
 		beanMap.put("mobile", userInfo.getMobile());
 		beanMap.put("realname", userInfo.getDisplayName());
 		beanMap.put("birthday", userInfo.getBirthDate());
+		beanMap.put("departmentId", userInfo.getDepartmentId());
 		beanMap.put("department", userInfo.getDepartment());
 		beanMap.put("createdate", userInfo.getCreatedDate());
 		beanMap.put("title", userInfo.getJobTitle());
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OpenIdConnectUserInfoEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OpenIdConnectUserInfoEndpoint.java
index b24a0b68..da1e4117 100644
--- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OpenIdConnectUserInfoEndpoint.java
+++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OpenIdConnectUserInfoEndpoint.java
@@ -138,6 +138,8 @@ public class OpenIdConnectUserInfoEndpoint {
 			 jwtClaimsSetBuilder.claim(WebConstants.ONLINE_TICKET_NAME, authentication.getOnlineTicket().getTicketId());
 			 
 		 	if(scopes.contains("profile")){
+		 		jwtClaimsSetBuilder.claim("userId", userInfo.getId());
+		 		jwtClaimsSetBuilder.claim("user", userInfo.getUsername());
 		 		jwtClaimsSetBuilder.claim("name", userInfo.getUsername());
 		 		jwtClaimsSetBuilder.claim("preferred_username", userInfo.getDisplayName());
 		 		jwtClaimsSetBuilder.claim("given_name", userInfo.getGivenName());
@@ -147,6 +149,9 @@ public class OpenIdConnectUserInfoEndpoint {
 		 		jwtClaimsSetBuilder.claim("profile", "profile");
 		 		jwtClaimsSetBuilder.claim("picture", "picture");
 		 		jwtClaimsSetBuilder.claim("website", userInfo.getWebSite());
+		 		
+		 		jwtClaimsSetBuilder.claim("departmentId", userInfo.getDepartmentId());
+		 		jwtClaimsSetBuilder.claim("department", userInfo.getDepartment());
 				
 				String gender;
 				 switch(userInfo.getGender()){