diff --git a/libs/app.bundle.js b/libs/app.bundle.js
index ef3ae7e6d..d189ad33f 100644
--- a/libs/app.bundle.js
+++ b/libs/app.bundle.js
@@ -15676,19 +15676,22 @@ var authenticatedUser = false;
 
 function connect(jid, password, uiCredentials) {
     var bosh
-        = uiCredentials.bosh || config.bosh || '/http-bind';
+        = (uiCredentials && uiCredentials.bosh? uiCredentials.bosh : null)
+        || config.bosh || '/http-bind';
     connection = new Strophe.Connection(bosh);
     Moderator.setConnection(connection);
 
-    var email = uiCredentials.email;
-    var displayName = uiCredentials.displayName;
-    if(email) {
-        connection.emuc.addEmailToPresence(email);
-    } else {
-        connection.emuc.addUserIdToPresence(uiCredentials.uid);
-    }
-    if(displayName) {
-        connection.emuc.addDisplayNameToPresence(displayName);
+    if(uiCredentials) {
+        var email = uiCredentials.email;
+        var displayName = uiCredentials.displayName;
+        if (email) {
+            connection.emuc.addEmailToPresence(email);
+        } else {
+            connection.emuc.addUserIdToPresence(uiCredentials.uid);
+        }
+        if (displayName) {
+            connection.emuc.addDisplayNameToPresence(displayName);
+        }
     }
 
     if (connection.disco) {
diff --git a/modules/xmpp/xmpp.js b/modules/xmpp/xmpp.js
index b0966c5d5..7dcb653d3 100644
--- a/modules/xmpp/xmpp.js
+++ b/modules/xmpp/xmpp.js
@@ -13,19 +13,22 @@ var authenticatedUser = false;
 
 function connect(jid, password, uiCredentials) {
     var bosh
-        = uiCredentials.bosh || config.bosh || '/http-bind';
+        = (uiCredentials && uiCredentials.bosh? uiCredentials.bosh : null)
+        || config.bosh || '/http-bind';
     connection = new Strophe.Connection(bosh);
     Moderator.setConnection(connection);
 
-    var email = uiCredentials.email;
-    var displayName = uiCredentials.displayName;
-    if(email) {
-        connection.emuc.addEmailToPresence(email);
-    } else {
-        connection.emuc.addUserIdToPresence(uiCredentials.uid);
-    }
-    if(displayName) {
-        connection.emuc.addDisplayNameToPresence(displayName);
+    if(uiCredentials) {
+        var email = uiCredentials.email;
+        var displayName = uiCredentials.displayName;
+        if (email) {
+            connection.emuc.addEmailToPresence(email);
+        } else {
+            connection.emuc.addUserIdToPresence(uiCredentials.uid);
+        }
+        if (displayName) {
+            connection.emuc.addDisplayNameToPresence(displayName);
+        }
     }
 
     if (connection.disco) {