diff --git a/gateway/session.py b/gateway/session.py
index be393e48e6fc..0118119aa7ea 100644
--- a/gateway/session.py
+++ b/gateway/session.py
@@ -306,13 +306,14 @@ def build_session_context_prompt(
             f"**Session type:** {session_label} — messages are prefixed "
             "with [sender name]. Multiple users may participate."
         )
-    elif context.source.user_name:
-        lines.append(f"**User:** {context.source.user_name}")
-    elif context.source.user_id:
-        uid = context.source.user_id
-        if redact_pii:
-            uid = _hash_sender_id(uid)
-        lines.append(f"**User ID:** {uid}")
+    else:
+        if context.source.user_name:
+            lines.append(f"**User:** {context.source.user_name}")
+        if context.source.user_id:
+            uid = context.source.user_id
+            if redact_pii:
+                uid = _hash_sender_id(uid)
+            lines.append(f"**User ID:** {uid}")
 
     # Platform-specific behavioral notes
     if context.source.platform == Platform.SLACK: