--- a/src/browser/sat_browser/dialog.py	Thu Apr 09 11:46:45 2015 +0200
+++ b/src/browser/sat_browser/dialog.py	Thu Apr 09 11:37:25 2015 +0200
@@ -54,10 +54,11 @@
 
     GENERATE_MUC = "<use random name>"
 
-    def __init__(self, host, default_room=C.DEFAULT_MUC):
+    def __init__(self, host, room_jid_s=None):
         """
 
         @param host (SatWebFrontend)
+        @param room_jid_s (unicode): room JID
         """
         Grid.__init__(self, 2, 2, Width='100%')
         self.host = host
@@ -65,7 +66,7 @@
         self.new_radio = RadioButton("room", "Discussion room:")
         self.new_radio.setChecked(True)
         self.box = TextBox(Width='95%')
-        self.box.setText(self.GENERATE_MUC if default_room == "" else default_room)
+        self.box.setText(room_jid_s if room_jid_s else self.GENERATE_MUC)
         self.exist_radio = RadioButton("room", "Already joined:")
         self.rooms_list = ListBox(Width='95%')
 
@@ -203,7 +204,7 @@
         button_panel.add(ok_button)
         button_panel.add(Button("Cancel", self.onCancel))
 
-        self.room_panel = RoomChooser(host, "" if visible == (False, True) else C.DEFAULT_MUC)
+        self.room_panel = RoomChooser(host, None if visible == (False, True) else host.default_muc)
         self.contact_panel = ContactsChooser(host, nb_contact, ok_button)
 
         self.stack_panel = base_panel.ToggleStackPanel(Width="100%")