diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java
index 642d30782..c7cbcf31a 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java
+++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java
@@ -393,7 +393,7 @@ public class HallRequestHandler extends LotroServerRequestHandler implements Uri
             _hallServer.signupUserForHall(resourceOwner, new SerializeHallInfoVisitor(doc, hall));
             for (Map.Entry<String, LotroFormat> format : _formatLibrary.getHallFormats().entrySet()) {
                 //playtest formats are opt-in
-                if (format.getKey().startsWith("test") && !player.getType().contains("p"))
+                if (format.getKey().startsWith("test") && !player.hasType(Player.Type.PLAY_TESTER))
                     continue;
 
                 Element formatElem = doc.createElement("format");
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js
index 73abeb215..591e3dc4e 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js
@@ -645,7 +645,7 @@ var GempLotrHallUI = Class.extend({
 					
 					//TODO: Replace this with an actual fix on the server side
 					if(name.includes("Casual - WC")) {
-						name = "<td>Competitive - 2023 World Championship Walk-on Qualifiers</td>"
+						name = "<td><b>Group Stage - 2023 World Championship</b></td>"
 					}
 					row.append(name);
 					row.append("<td>" + statusDescription + "</td>");
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/Player.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/Player.java
index 47cf6c087..ed71540a9 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/Player.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/Player.java
@@ -16,7 +16,7 @@ public class Player {
         LEAGUE_ADMIN("l"),
         PLAY_TESTER("p"),
         //PLAY_TESTING_ADMIN("t"),
-        //COMMENTATOR("c"),
+        COMMENTATOR("c"),
         //COMMENTATOR_ADMIN("m"),
         UNBANNED("n"),
         USER("u");
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
index 0729b04f3..2d0055db5 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
@@ -546,7 +546,9 @@ public class HallServer extends AbstractServer {
     }
 
     protected void processHall(Player player, HallInfoVisitor visitor) {
-        final boolean isAdmin = player.getType().contains("a");
+        //Commentators are users permitted to watch tournament matches for the purposes of stream broadcasting.
+        //TODO: enhance this logic to not apply to tournaments that the commentator is themselves participating in
+        final boolean isAdmin = player.hasType(Player.Type.ADMIN) || player.hasType(Player.Type.COMMENTATOR);
 
         _hallDataAccessLock.readLock().lock();
         try {