diff --git a/src/plugins/plugin_xep_0045.py b/src/plugins/plugin_xep_0045.py
index c54cd760..46bd9302 100755
--- a/src/plugins/plugin_xep_0045.py
+++ b/src/plugins/plugin_xep_0045.py
@@ -388,7 +388,7 @@ class XEP_0045(object):
         """
         return self.host.memory.getConfig(CONFIG_SECTION, 'default_muc', default_conf['default_muc'])
 
-    def _join(self, room_jid_s, nick, options=None, profile_key=C.PROF_KEY_NONE):
+    def _join(self, room_jid_s, nick, options, profile_key=C.PROF_KEY_NONE):
         """join method used by bridge
 
         @return: unicode (the room bare)
@@ -405,7 +405,7 @@ class XEP_0045(object):
         else:
             room_jid = self.getUniqueName(profile_key=client.profile)
         # TODO: error management + signal in bridge
-        d = self.join(client, room_jid, nick, options)
+        d = self.join(client, room_jid, nick, options or None)
         return d.addCallback(lambda room: room.roomJID.userhost())
 
     def join(self, client, room_jid, nick=None, options=None):