diff --git a/argocd/apps/mastodon.yaml b/argocd/apps/mastodon.yaml
index e6b5241..683cd8c 100644
--- a/argocd/apps/mastodon.yaml
+++ b/argocd/apps/mastodon.yaml
@@ -85,7 +85,8 @@ spec:
               issuer: https://auth.t0rt1k.tech/
               discovery: true
               scope: "openid"
-              uidField: sub
+              uidField: preferred_username
+              nameField: name
               clientId: 01KXBMX4RKEYG24GW7ZXXHFD01
               clientSecret: o9GCnfhbw1jFaTPwJ4vm
               redirectUri: https://mastodon.t0rt1k.tech/auth/auth/openid_connect/callback