Index: server/authjs-handler.ts
===================================================================
--- server/authjs-handler.ts	(revision 898cf683befadffe8aea07855b58db8cd5082ff9)
+++ server/authjs-handler.ts	(revision ad311c33bc79a550eeaa21f0291e015ee0021a78)
@@ -67,7 +67,6 @@
           if (user) {
               token.sub = user.id;
-              token.username = user.name;
-
               const customUser = user as any;
+              token.username = customUser.username;
               token.email = customUser.email;
               token.isAdmin = customUser.isAdmin;
@@ -78,5 +77,5 @@
           if (session.user) {
               session.user.id = token.sub!;
-              session.user.name = token.name as string;
+              session.user.name = token.username as string;
 
               const customToken = token as any;