diff --git a/lib/vue/src/plugins/auth.ts b/lib/vue/src/plugins/auth.ts
index e99fdb579..077c4e545 100644
--- a/lib/vue/src/plugins/auth.ts
+++ b/lib/vue/src/plugins/auth.ts
@@ -370,15 +370,12 @@ export class Auth {
 
         const authUser = new system.User({
           userID: data.sub,
-          name: data.name,
-          email: data.email,
-          handle: data.username,
-          roles: data.roles || [],
           meta: {
             preferredLanguage: data.preferred_language || 'en',
             avatarID: data.avatarID,
             theme: data.theme,
           },
+          ...data,
         })
 
         this[user] = authUser
@@ -570,15 +567,12 @@ export class Auth {
 
     const u = new system.User({
       userID: oa2tkn.sub,
-      name: oa2tkn.name,
-      handle: oa2tkn.handle,
-      email: oa2tkn.email,
-      roles: oa2tkn.roles || [],
       meta: {
         preferredLanguage: oa2tkn.preferred_language || 'en',
         avatarID: oa2tkn.avatarID,
         theme: oa2tkn.theme,
       },
+      ...oa2tkn,
     })
 
     this[accessToken] = oa2tkn.access_token
diff --git a/server/auth/handlers/handle_oauth2.go b/server/auth/handlers/handle_oauth2.go
index b69be06d4..3379e64c4 100644
--- a/server/auth/handlers/handle_oauth2.go
+++ b/server/auth/handlers/handle_oauth2.go
@@ -457,6 +457,12 @@ func (h AuthHandlers) handleTokenRequest(req *request.AuthReq, client *types.Aut
 		response["avatarID"] = strconv.FormatUint(user.Meta.AvatarID, 10)
 	}
 
+	if user.Labels != nil {
+		response["labels"] = user.Labels
+	} else {
+		response["labels"] = make(map[string]interface{})
+	}
+
 	//include user's theme
 	response["theme"] = user.Meta.Theme