diff --git a/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy b/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy
index 3187d125..5b15f925 100644
--- a/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy
+++ b/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy
@@ -72,7 +72,7 @@ class ChatRoomController {
                 params['host'] = model.host
                 params['roomTabName'] = newRoom
 
-                mvcGroup.parentGroup.createMVCGroup("chat-room", newRoom, params)
+                mvcGroup.parentGroup.createMVCGroup("chat-room", model.host.getHumanReadableName()+"-"+newRoom, params)
             }
         }
         if (command.action == ChatAction.LEAVE && !model.console) {
diff --git a/gui/griffon-app/models/com/muwire/gui/ChatServerModel.groovy b/gui/griffon-app/models/com/muwire/gui/ChatServerModel.groovy
index d5d82ee1..974f2cb6 100644
--- a/gui/griffon-app/models/com/muwire/gui/ChatServerModel.groovy
+++ b/gui/griffon-app/models/com/muwire/gui/ChatServerModel.groovy
@@ -97,7 +97,7 @@ class ChatServerModel {
         }
         if (chatCommand.action == ChatAction.SAY &&
             room == core.me.toBase64()) {
-            String groupId = e.sender.getHumanReadableName() + "-private-chat"
+            String groupId = host.getHumanReadableName()+"-"+e.sender.getHumanReadableName() + "-private-chat"
             if (!mvcGroup.childrenGroups.containsKey(groupId)) {
                 def params = [:]
                 params['core'] = core
@@ -110,7 +110,8 @@ class ChatServerModel {
                 mvcGroup.createMVCGroup("chat-room",groupId, params)
             }
             room = groupId
-        }
+        } else
+            room = host.getHumanReadableName()+"-"+room
         mvcGroup.childrenGroups[room]?.controller?.handleChatMessage(e)
     }
     
diff --git a/gui/griffon-app/views/com/muwire/gui/ChatServerView.groovy b/gui/griffon-app/views/com/muwire/gui/ChatServerView.groovy
index c986fcc4..80656d9c 100644
--- a/gui/griffon-app/views/com/muwire/gui/ChatServerView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/ChatServerView.groovy
@@ -69,7 +69,7 @@ class ChatServerView {
         params['roomTabName'] = 'Console'
         params['console'] = true
         params['host'] = model.host
-        mvcGroup.createMVCGroup("chat-room",ChatServer.CONSOLE, params) 
+        mvcGroup.createMVCGroup("chat-room",model.host.getHumanReadableName()+"-"+ChatServer.CONSOLE, params) 
     }
 
     def closeTab = {