diff --git a/Source/Server.java b/Source/Server.java
index b56815c..edd19ba 100644
--- a/Source/Server.java
+++ b/Source/Server.java
@@ -58,9 +58,9 @@ class ClientHandler implements Runnable {
 
     public void run() {
         try {
-            String message;
+            String message = clientSocket.getRemoteSocketAddress().toString() + ": ";
 
-            while ((message = reader.readLine()) != null) {
+            while ((message += reader.readLine()) != null) {
                 server.broadcast(message, this);
             }
         } catch (IOException e) {