diff --git a/api/gameforge/team.ts b/api/gameforge/team.ts
index 4e310f3c..8dac79cc 100644
--- a/api/gameforge/team.ts
+++ b/api/gameforge/team.ts
@@ -21,7 +21,7 @@ export default async function handler(req: any, res: any) {
         { count: "exact" },
       );
 
-      if (user_id) dbQuery = dbQuery.eq("user_id", user_id).single();
+      if (user_id) dbQuery = dbQuery.eq("user_id", user_id).single() as any;
       if (project_id) dbQuery = dbQuery.contains("project_ids", [project_id]);
       if (role) dbQuery = dbQuery.eq("role", role);
       if (!user_id) dbQuery = dbQuery.eq("is_active", true);
diff --git a/api/games/roblox-auth.ts b/api/games/roblox-auth.ts
index 6eec16a7..d8d6dee9 100644
--- a/api/games/roblox-auth.ts
+++ b/api/games/roblox-auth.ts
@@ -102,7 +102,7 @@ export default async function handler(req: VercelRequest, res: VercelResponse) {
       success: true,
       game_token: gameToken,
       user_id: userData.id,
-      username: userData.username,
+      username: userData.username || roblox_username,
       expires_in: 86400, // seconds
     });
   } catch (error: any) {