diff --git a/conversejs/conversejs.js b/conversejs/builtin.js
similarity index 75%
rename from conversejs/conversejs.js
rename to conversejs/builtin.js
index 060ecd1c..6881319f 100644
--- a/conversejs/conversejs.js
+++ b/conversejs/builtin.js
@@ -1,20 +1,22 @@
-require('converse.js')
-
 window.initConverse = function initConverse ({
-  baseStaticUrl,
+  jid,
+  assetsPath,
   room,
-  boshServiceUrl
+  boshServiceUrl,
+  websocketServiceUrl
 }) {
   window.converse.initialize({
-    assets_path: baseStaticUrl,
+    assets_path: assetsPath,
 
     authentication: 'anonymous',
     auto_login: true,
     auto_join_rooms: [
       room
     ],
-    bosh_service_url: boshServiceUrl,
-    jid: 'peertube.im.your_domain',
+    discover_connection_methods: true,
+    bosh_service_url: boshServiceUrl === '' ? undefined : boshServiceUrl,
+    websocket_url: websocketServiceUrl === '' ? undefined : websocketServiceUrl,
+    jid: jid,
     notify_all_room_messages: [
       room
     ],
diff --git a/conversejs/index.html b/conversejs/index.html
index 4dbaccbd..d3bd9f98 100644
--- a/conversejs/index.html
+++ b/conversejs/index.html
@@ -5,7 +5,8 @@
     <meta charset="utf-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <meta name="description" content="Converse XMPP/Jabber Chat"/>
-    <script src="{{BASE_STATIC_URL}}/conversejs.js"></script>
+    <script src="{{BASE_STATIC_URL}}/conversejs/converse.min.js"></script>
+    <script src="{{BASE_STATIC_URL}}/static/builtin.js"></script>
     <style type="text/css">
         #conversejs .chat-head {
                 display: none;
@@ -17,9 +18,11 @@
 <div id="conversejs-bg"></div>
 <script>
   initConverse({
-    baseStaticUrl : '{{BASE_STATIC_URL}}',
+    jid: '{{JID}}',
+    assetsPath : '{{BASE_STATIC_URL}}/conversejs/',
     room: '{{ROOM}}',
-    boshServiceUrl: '{{BOSH_SERVICE_URL}}'
+    boshServiceUrl: '{{BOSH_SERVICE_URL}}',
+    websocketServiceUrl: '{{WS_SERVICE_URL}}',
   })
 </script>
 </body>
diff --git a/main.js b/main.js
index 340d1c53..fcbea58c 100644
--- a/main.js
+++ b/main.js
@@ -57,12 +57,24 @@ async function register ({
     'You still have to configure an external XMPP service. Please see the documentation.'
   })
   registerSetting({
-    name: 'chat-room-server',
-    label: 'Builtin webchat: XMPP room service server',
+    name: 'chat-server',
+    label: 'Builtin webchat: XMPP service server',
     type: 'input',
     default: '',
     descriptionHTML: 'When using the built-in converseJS webchat:<br>' +
-      'Your XMPP room server. Example : room.peertube.im.your_domain.',
+      'Your XMPP server. Without any scheme. Example : peertube.im.your_domain.',
+    private: true
+  })
+  registerSetting({
+    name: 'chat-room',
+    label: 'Builtin webchat: XMPP room template',
+    type: 'input',
+    default: '',
+    descriptionHTML: 'When using the built-in converseJS webchat:<br>' +
+      'Your XMPP room. You can use the placeholder {{VIDEO_UUID}} to add the video UUID.' +
+      'Without this placeholder, all videos will point to the same chat room.<br>' +
+      'Example: public@room.peertube.im.your_domain<br>' +
+      'Example: public_{{VIDEO_UUID}}@room.peertube.im.your_domain',
     private: true
   })
   registerSetting({
@@ -71,7 +83,18 @@ async function register ({
     type: 'input',
     default: '',
     descriptionHTML: 'When using the built-in converseJS webchat:<br>' +
-      'URI of the external BOSH server. Please make sure it accept cross origin request from your domain.',
+      'URI of the external BOSH server. Please make sure it accept cross origin request from your domain.<br>' +
+      'You must at least have a BOSH or a Websocket uri.',
+    private: true
+  })
+  registerSetting({
+    name: 'chat-ws-uri',
+    label: 'Builtin webchat: WS uri',
+    type: 'input',
+    default: '',
+    descriptionHTML: 'When using the built-in converseJS webchat:<br>' +
+      'URI of the external WS server. Please make sure it accept cross origin request from your domain.<br>' +
+      'You must at least have a BOSH or a Websocket uri.',
     private: true
   })
 
@@ -105,14 +128,21 @@ async function register ({
   router.get('/webchat', async (req, res, next) => {
     try {
       const settings = await settingsManager.getSettings([
-        'chat-use-builtin', 'chat-room-server', 'chat-bosh-uri'
+        'chat-use-builtin', 'chat-room', 'chat-server',
+        'chat-bosh-uri', 'chat-ws-uri'
       ])
 
       if (!settings['chat-use-builtin']) {
         throw new Error('Builtin chat disabled.')
       }
-      if (!settings['chat-room-server']) {
-        throw new Error('Missing chat-room-server settings.')
+      if (!settings['chat-server']) {
+        throw new Error('Missing chat-server settings.')
+      }
+      if (!settings['chat-room']) {
+        throw new Error('Missing chat-room settings.')
+      }
+      if (!settings['chat-bosh-uri'] && !settings['chat-ws-uri']) {
+        throw new Error('Missing BOSH or Websocket uri.')
       }
 
       // FIXME: with Peertube 3.0.1 the following method is not available...
@@ -137,10 +167,13 @@ async function register ({
 
       let page = '' + converseJSIndex
       // FIXME: Peertube should provide the static folder path. For now:
-      const staticRelative = '../static/conversejs'
+      const staticRelative = '../static'
       page = page.replace(/{{BASE_STATIC_URL}}/g, staticRelative)
-      page = page.replace(/{{ROOM}}/g, 'public_' + video.uuid + '@' + settings['chat-room-server'])
+      page = page.replace(/{{JID}}/g, settings['chat-server'])
+      const room = settings['chat-room'].replace(/{{VIDEO_UUID}}/g, video.uuid)
+      page = page.replace(/{{ROOM}}/g, room)
       page = page.replace(/{{BOSH_SERVICE_URL}}/g, settings['chat-bosh-uri'])
+      page = page.replace(/{{WS_SERVICE_URL}}/g, settings['chat-ws-uri'])
 
       res.status(200)
       res.send(page)
diff --git a/package.json b/package.json
index d17c5e1f..e34170be 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "peertube-plugin-livechat",
   "description": "PeerTube plugin livechat",
-  "version": "0.1.0",
+  "version": "0.0.9",
   "author": "John Livingston",
   "bugs": "https://github.com/JohnXLivingston/peertube-plugin-livechat/issues",
   "clientScripts": [
@@ -47,7 +47,8 @@
     "lint": "npx eslint --ext .js ."
   },
   "staticDirs": {
-    "conversejs": "dist/conversejs"
+    "static": "dist/static",
+    "conversejs": "node_modules/converse.js/dist"
   },
   "translations": {
     "fr-FR": "./languages/fr.json"
diff --git a/webpack.config.js b/webpack.config.js
index 5f210fb0..db1d51f2 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -19,10 +19,10 @@ let config = clientFiles.map(f => ({
 }))
 
 config.push({
-  entry: "./conversejs/conversejs.js",
+  entry: "./conversejs/builtin.js",
   output: {
-    path: path.resolve(__dirname, "./dist/conversejs"),
-    filename: "./conversejs.js"
+    path: path.resolve(__dirname, "./dist/static"),
+    filename: "./builtin.js"
   }
 })