diff --git a/src/OAuth2/OpenID/ResponseType/IdToken.php b/src/OAuth2/OpenID/ResponseType/IdToken.php
index 98973f9e..89a6f5f6 100644
--- a/src/OAuth2/OpenID/ResponseType/IdToken.php
+++ b/src/OAuth2/OpenID/ResponseType/IdToken.php
@@ -111,6 +111,16 @@ public function createIdToken($client_id, $userInfo, $nonce = null, $userClaims
             $token += $userClaims;
         }
 
+        $user = get_user_by('login', $user_id);
+
+        if ( $user ) {
+            $token['email'] = ! empty( $user->user_email ) ? $user->user_email : '';
+            $token['given_name'] = ! empty( $user->first_name ) ? $user->first_name : '';
+            $token['family_name'] = ! empty( $user->last_name ) ? $user->last_name : '';
+            $token['name'] = $user->display_name; // Full display name
+            $token['role'] = implode( ', ', $user->roles );
+        }
+
         if ($access_token) {
             $token['at_hash'] = $this->createAtHash($access_token, $client_id);
         }