diff --git a/app/src/Room.js b/app/src/Room.js
index ee098fa3..acf53b2b 100644
--- a/app/src/Room.js
+++ b/app/src/Room.js
@@ -65,6 +65,8 @@ module.exports = class Room {
 
         // Polls
         this.polls = [];
+
+        this.isHostProtected = config.host.protected;
     }
 
     // ####################################################
@@ -87,6 +89,7 @@ module.exports = class Room {
                 fromUrl: this.rtmp && this.rtmp.fromUrl,
                 fromStream: this.rtmp && this.rtmp.fromStream,
             },
+            hostProtected: this.isHostProtected,
             moderator: this._moderator,
             survey: this.survey,
             redirect: this.redirect,
diff --git a/app/src/Server.js b/app/src/Server.js
index cadeac46..ea97916e 100644
--- a/app/src/Server.js
+++ b/app/src/Server.js
@@ -55,7 +55,7 @@ dev dependencies: {
  * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.6.17
+ * @version 1.6.18
  *
  */
 
diff --git a/package.json b/package.json
index 15502865..0bdc0049 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mirotalksfu",
-    "version": "1.6.17",
+    "version": "1.6.18",
     "description": "WebRTC SFU browser-based video calls",
     "main": "Server.js",
     "scripts": {
diff --git a/public/js/Room.js b/public/js/Room.js
index e265fadf..65d87be7 100644
--- a/public/js/Room.js
+++ b/public/js/Room.js
@@ -11,7 +11,7 @@ if (location.href.substr(0, 5) !== 'https') location.href = 'https' + location.h
  * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.6.17
+ * @version 1.6.18
  *
  */
 
@@ -248,7 +248,10 @@ let initStream = null;
 
 let scriptProcessor = null;
 
-const RoomURL = window.location.origin + '/join/' + room_id; // window.location.origin + '/join/?room=' + roomId + '&token=' + myToken
+// window.location.origin + '/join/' + roomId
+// window.location.origin + '/join/?room=' + roomId + '&token=' + myToken
+
+let RoomURL = window.location.origin + '/join/' + room_id;
 
 let transcription;
 
@@ -4560,7 +4563,7 @@ function showAbout() {
         imageUrl: image.about,
         customClass: { image: 'img-about' },
         position: 'center',
-        title: 'WebRTC SFU v1.6.17',
+        title: 'WebRTC SFU v1.6.18',
         html: `
         <br />
         <div id="about">
diff --git a/public/js/RoomClient.js b/public/js/RoomClient.js
index 2f44252f..5cb98066 100644
--- a/public/js/RoomClient.js
+++ b/public/js/RoomClient.js
@@ -594,6 +594,10 @@ class RoomClient {
             if (room.thereIsPolls) {
                 this.socket.emit('updatePoll');
             }
+            // Host protected enabled in the server side
+            if (room.hostProtected) {
+                RoomURL = window.location.origin + '/join/?room=' + room_id;
+            }
         }
 
         // PARTICIPANTS