diff --git a/app.js b/app.js
index 889096d2e..3403cd8c3 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ function init() {
 
     APP.desktopsharing.init();
     APP.RTC.start();
-    APP.xmpp.start();
+    APP.xmpp.start(APP.settings.getJid(), null);
     APP.statistics.start();
     APP.connectionquality.init();
     APP.keyboardshortcut.init();
diff --git a/modules/settings/Settings.js b/modules/settings/Settings.js
index 204dbbf34..86c763ad7 100644
--- a/modules/settings/Settings.js
+++ b/modules/settings/Settings.js
@@ -95,7 +95,17 @@ var Settings = {
     setLanguage: function (lang) {
         language = lang;
         window.localStorage.language = lang;
+    },
+    getJid: function() {
+      var configDomain = config.hosts.anonymousdomain || config.hosts.domain;
+      // Force authenticated domain if room is appended with '?login=true'
+      if (config.hosts.anonymousdomain &&
+          window.location.search.indexOf("login=true") !== -1) {
+          configDomain = config.hosts.domain;
+      }
+      var jid = configDomain || window.location.hostname;
     }
+
 };
 
 module.exports = Settings;
diff --git a/modules/xmpp/xmpp.js b/modules/xmpp/xmpp.js
index 0e90713d2..89f0e4c68 100644
--- a/modules/xmpp/xmpp.js
+++ b/modules/xmpp/xmpp.js
@@ -295,7 +295,7 @@ var XMPP = {
      * @type {boolean}
      */
     forceMuted: false,
-    start: function () {
+    start: function (jid, password) {
         setupEvents();
         initStrophePlugins();
         registerListeners();