diff --git a/src/pc/chat_commands.c b/src/pc/chat_commands.c
index cce703f79..08164ca99 100644
--- a/src/pc/chat_commands.c
+++ b/src/pc/chat_commands.c
@@ -1,4 +1,5 @@
 #include "pc/network/network.h"
+#include "pc/network/socket/socket.h"
 #include "pc/lua/smlua_hooks.h"
 #include "pc/djui/djui_chat_message.h"
 #include "chat_commands.h"
@@ -88,7 +89,11 @@ bool exec_chat_command(char* command) {
         for (int i = 0; i < MAX_PLAYERS; i++) {
             struct NetworkPlayer* np = &gNetworkPlayers[i];
             if (!np->connected) { continue; }
-            snprintf(line, 128, "\\#82f9ff\\%u \\#fff982\\- %s%s\n", np->globalIndex, network_get_player_text_color_string(np->localIndex), np->name);
+            if (gNetworkSystem == &gNetworkSystemSocket) {
+                snprintf(line, 128, "\\#82f9ff\\%u\\#fff982\\ - %s%s\n", np->globalIndex, network_get_player_text_color_string(np->localIndex), np->name);
+            } else {
+                snprintf(line, 128, "\\#82f9ff\\%u\\#fff982\\ - \\#82f9ff\\%s\\#fff982\\ - %s%s\n", np->globalIndex, gNetworkSystem->get_id_str(np->localIndex), network_get_player_text_color_string(np->localIndex), np->name);
+            }
             strncat(message, line, 599);
         }
         djui_chat_message_create(message);
diff --git a/src/pc/network/discord/discord_network.c b/src/pc/network/discord/discord_network.c
index b34cefdf0..2cfcb535e 100644
--- a/src/pc/network/discord/discord_network.c
+++ b/src/pc/network/discord/discord_network.c
@@ -41,13 +41,17 @@ void discord_network_flush(void) {
 }
 
 s64 ns_discord_get_id(u8 localId) {
+    if (localId == 0) { return app.userId; }
     return gNetworkUserIds[localId];
 }
 
 char* ns_discord_get_id_str(u8 localId) {
-    if (localId == UNKNOWN_LOCAL_INDEX) { localId = 0; }
     static char id_str[22] = { 0 };
-    snprintf(id_str, 22, "%lld", (long long int)gNetworkUserIds[localId]);
+    if (localId == UNKNOWN_LOCAL_INDEX) {
+        snprintf(id_str, 22, "???");
+    } else {
+        snprintf(id_str, 22, "%lld", (long long int)ns_discord_get_id(localId));
+    }
     return id_str;
 }