diff --git a/packages/backend/src/server/sso/JWTIdentifyProviderService.ts b/packages/backend/src/server/sso/JWTIdentifyProviderService.ts
index 182b6af04d..2671a7fcb4 100644
--- a/packages/backend/src/server/sso/JWTIdentifyProviderService.ts
+++ b/packages/backend/src/server/sso/JWTIdentifyProviderService.ts
@@ -172,7 +172,9 @@ export class JWTIdentifyProviderService {
 			const roles = await this.roleService.getUserRoles(user.id);
 
 			const payload: JWTPayload = {
-				name: user.name ?? user.username,
+				name: user.name ? `${user.name} (@${user.username})` : `@${user.username}`,
+				given_name: user.name ?? undefined,
+				family_name: `@${user.username}`,
 				preferred_username: user.username,
 				profile: `${this.config.url}/@${user.username}`,
 				picture: user.avatarUrl ?? undefined,
diff --git a/packages/backend/src/server/sso/SAMLIdentifyProviderService.ts b/packages/backend/src/server/sso/SAMLIdentifyProviderService.ts
index 96c32291fe..15ca1eecc7 100644
--- a/packages/backend/src/server/sso/SAMLIdentifyProviderService.ts
+++ b/packages/backend/src/server/sso/SAMLIdentifyProviderService.ts
@@ -492,20 +492,28 @@ export class SAMLIdentifyProviderService {
 													'#text': user.id,
 												},
 											},
-											{
-												'@Name': 'displayname',
+											...(user.name ? [{
+												'@Name': 'firstName',
 												'@NameFormat': 'urn:oasis:names:tc:SAML:2.0:attrname-format:basic',
 												'saml:AttributeValue': {
 													'@xsi:type': 'xs:string',
-													'#text': user.name ?? user.username,
+													'#text': user.name,
+												},
+											}] : []),
+											{
+												'@Name': 'lastName',
+												'@NameFormat': 'urn:oasis:names:tc:SAML:2.0:attrname-format:basic',
+												'saml:AttributeValue': {
+													'@xsi:type': 'xs:string',
+													'#text': `@${user.username}`,
 												},
 											},
 											{
-												'@Name': 'name',
+												'@Name': 'displayName',
 												'@NameFormat': 'urn:oasis:names:tc:SAML:2.0:attrname-format:basic',
 												'saml:AttributeValue': {
 													'@xsi:type': 'xs:string',
-													'#text': user.username,
+													'#text': user.name ? `${user.name} (@${user.username})` : `@${user.username}`,
 												},
 											},
 											{