diff --git a/app/features/tournament-bracket/components/StartedMatch.tsx b/app/features/tournament-bracket/components/StartedMatch.tsx
index c01f747c0..7eae1d471 100644
--- a/app/features/tournament-bracket/components/StartedMatch.tsx
+++ b/app/features/tournament-bracket/components/StartedMatch.tsx
@@ -556,6 +556,10 @@ function StartedMatchTabs({
 		return Object.fromEntries(
 			[
 				...data.match.players.map((p) => ({ ...p, title: undefined })),
+				...(tournament.ctx.organization?.members ?? []).map((m) => ({
+					...m,
+					title: m.role === "STREAMER" ? "Stream" : "TO",
+				})),
 				...tournament.ctx.staff.map((s) => ({
 					...s,
 					title: s.role === "STREAMER" ? "Stream" : "TO",
@@ -663,7 +667,7 @@ function StartedMatchTabs({
 										chat={chat}
 										onMount={onChatMount}
 										onUnmount={onChatUnmount}
-										missingUserName="TO"
+										missingUserName="???"
 									/>
 								) : null}
 							</>
diff --git a/app/features/tournament/TournamentRepository.server.ts b/app/features/tournament/TournamentRepository.server.ts
index 75af46230..d3f928f0e 100644
--- a/app/features/tournament/TournamentRepository.server.ts
+++ b/app/features/tournament/TournamentRepository.server.ts
@@ -58,7 +58,8 @@ export async function findById(id: number) {
 								.select([
 									"TournamentOrganizationMember.userId",
 									"TournamentOrganizationMember.role",
-									"User.username",
+									...COMMON_USER_FIELDS,
+									userChatNameColor,
 								])
 								.whereRef(
 									"TournamentOrganizationMember.organizationId",