diff --git a/src/lib.rs b/src/lib.rs
index af1e2be..f00ffd2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -41,8 +41,12 @@ impl GameServer {
                         continue;
                     }
                     if msg.source.is_empty() {
-                        msg.source = id.clone();
+                        msg.source = format!("({})", id.clone());
                     }
+                    else {
+                    	msg.source = format!("{} ({})", msg.source, id.clone());
+                    }
+                    
                     self.chat.push((id.clone(), msg.clone()));
                     _ = broadcast.send((None, api::Response::Message(msg)));
                  },
@@ -70,4 +74,4 @@ impl GameServer {
         }
         _ = broadcast.send((None, api::Response::Shutdown));
     }
-}
\ No newline at end of file
+}