diff --git a/com.thalesgroup.nl.chat.impl/src/com/thalesgroup/nl/chat/impl/ChatServer.java b/com.thalesgroup.nl.chat.impl/src/com/thalesgroup/nl/chat/impl/ChatServer.java
index 7e8655b..88c5802 100644
--- a/com.thalesgroup.nl.chat.impl/src/com/thalesgroup/nl/chat/impl/ChatServer.java
+++ b/com.thalesgroup.nl.chat.impl/src/com/thalesgroup/nl/chat/impl/ChatServer.java
@@ -30,8 +30,10 @@ public class ChatServer {
         chat.sendMessage(NAME, String.format("Hoi %s!", name));
     }
     
-    public void removeChatter(Chat chat){
-        chatters.remove(chat);
+    public void removeChatter(Chat chat, Map props){
+        String name = (String) props.get("participant.name");
+        System.out.printf("Removing %s%n", name);
+        chatters.remove(name);
     }
 
     public void send(String name, String message){