diff --git a/JitsiConference.js b/JitsiConference.js
index a9ea78f12..1356f3574 100644
--- a/JitsiConference.js
+++ b/JitsiConference.js
@@ -330,7 +330,7 @@ JitsiConference.prototype.lock = function (password) {
 
   var conference = this;
   return new Promise(function (resolve, reject) {
-    conference.xmpp.lockRoom(password, function () {
+    conference.room.lockRoom(password || "", function () {
       resolve();
     }, function (err) {
       reject(err);
@@ -345,7 +345,7 @@ JitsiConference.prototype.lock = function (password) {
  * @returns {Promise}
  */
 JitsiConference.prototype.unlock = function () {
-  return this.lock(undefined);
+  return this.lock();
 };
 
 /**
diff --git a/lib-jitsi-meet.js b/lib-jitsi-meet.js
index 76532fb5a..fb3c8cae2 100644
--- a/lib-jitsi-meet.js
+++ b/lib-jitsi-meet.js
@@ -332,7 +332,7 @@ JitsiConference.prototype.lock = function (password) {
 
   var conference = this;
   return new Promise(function (resolve, reject) {
-    conference.xmpp.lockRoom(password, function () {
+    conference.room.lockRoom(password || "", function () {
       resolve();
     }, function (err) {
       reject(err);
@@ -347,7 +347,7 @@ JitsiConference.prototype.lock = function (password) {
  * @returns {Promise}
  */
 JitsiConference.prototype.unlock = function () {
-  return this.lock(undefined);
+  return this.lock();
 };
 
 /**
@@ -10482,8 +10482,7 @@ module.exports = TraceablePeerConnection;
 }).call(this,"/modules/xmpp/TraceablePeerConnection.js")
 },{"../../service/xmpp/XMPPEvents":87,"../RTC/RTC":16,"../RTC/RTCBrowserType.js":17,"./LocalSSRCReplacement":29,"jitsi-meet-logger":48,"sdp-interop":66,"sdp-simulcast":69,"sdp-transform":76}],34:[function(require,module,exports){
 (function (__filename){
-/* global $, $iq, APP, config, messageHandler,
- roomName, sessionTerminated, Strophe, Util */
+/* global $, $iq, Promise, Strophe */
 
 var logger = require("jitsi-meet-logger").getLogger(__filename);
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
@@ -10838,6 +10837,22 @@ Moderator.prototype.allocateConferenceFocus =  function (callback) {
     );
 };
 
+Moderator.prototype.authenticate = function () {
+    var self = this;
+    return new Promise(function (resolve, reject) {
+        self.connection.sendIQ(
+            self.createConferenceIq(),
+            function (result) {
+                self.parseSessionId(result);
+                resolve();
+            }, function (error) {
+                var code = $(error).find('>error').attr('code');
+                reject(error, code);
+            }
+        );
+    });
+};
+
 Moderator.prototype.getLoginUrl =  function (urlCallback, failureCallback) {
     var iq = $iq({to: this.getFocusComponent(), type: 'get'});
     iq.c('login-url', {
diff --git a/modules/xmpp/moderator.js b/modules/xmpp/moderator.js
index 7165532a6..0a19b92d8 100644
--- a/modules/xmpp/moderator.js
+++ b/modules/xmpp/moderator.js
@@ -1,5 +1,4 @@
-/* global $, $iq, APP, config, messageHandler,
- roomName, sessionTerminated, Strophe, Util */
+/* global $, $iq, Promise, Strophe */
 
 var logger = require("jitsi-meet-logger").getLogger(__filename);
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
@@ -354,6 +353,22 @@ Moderator.prototype.allocateConferenceFocus =  function (callback) {
     );
 };
 
+Moderator.prototype.authenticate = function () {
+    var self = this;
+    return new Promise(function (resolve, reject) {
+        self.connection.sendIQ(
+            self.createConferenceIq(),
+            function (result) {
+                self.parseSessionId(result);
+                resolve();
+            }, function (error) {
+                var code = $(error).find('>error').attr('code');
+                reject(error, code);
+            }
+        );
+    });
+};
+
 Moderator.prototype.getLoginUrl =  function (urlCallback, failureCallback) {
     var iq = $iq({to: this.getFocusComponent(), type: 'get'});
     iq.c('login-url', {