diff --git a/src/resources/js/meet/client.js b/src/resources/js/meet/client.js
index c67d4d3b..23e66323 100644
--- a/src/resources/js/meet/client.js
+++ b/src/resources/js/meet/client.js
@@ -1,792 +1,794 @@
 'use strict'
 
 import { Device, parseScalabilityMode } from 'mediasoup-client'
 import Config from './config.js'
 import { Media } from './media.js'
 import { Roles } from './constants.js'
 import { Socket } from './socket.js'
 
 
 function Client()
 {
     let eventHandlers = {}
     let camProducer
     let micProducer
     let screenProducer
     let consumers = {}
     let socket
     let sendTransportInfo
     let sendTransport
     let recvTransport
     let iceServers = []
     let nickname = ''
     let peers = {}
     let joinProps = {}
     let videoSource
     let audioSource
 
     const VIDEO_CONSTRAINTS = {
         'low': {
             width: { ideal: 320 }
         },
         'medium': {
             width: { ideal: 640 }
         },
         'high': {
             width: { ideal: 1280 }
         },
         'veryhigh': {
             width: { ideal: 1920 }
         },
         'ultra': {
             width: { ideal: 3840 }
         }
     }
 
     // Create a device (use browser auto-detection)
     const device = new Device()
 
     // A helper for basic browser media operations
     const media = new Media()
 
     this.media = media
 
     navigator.mediaDevices.addEventListener('devicechange', () => {
         trigger('deviceChange')
     })
 
 
     /**
      * Start a session (join a room)
      */
     this.joinSession = (token, props) => {
         // Store the join properties for later
         joinProps = props
         // Initialize the socket, 'roomReady' request handler will do the rest of the job
         socket = initSocket(token)
     }
 
     /**
      * Close the session (disconnect)
      */
     this.closeSession = async (reason) => {
         // If room owner, send the request to close the room
         if (reason === true && peers.self && peers.self.role & Roles.OWNER) {
             await socket.sendRequest('moderator:closeRoom')
         }
 
         trigger('closeSession', { reason: reason || 'disconnected' })
 
         if (socket) {
             socket.close()
         }
 
         media.setupStop()
 
         // Close mediasoup Transports.
         if (sendTransport) {
             sendTransport.close()
             sendTransport = null
         }
 
         if (recvTransport) {
             recvTransport.close()
             recvTransport = null
         }
 
         // Remove peers' video elements
         Object.keys(peers).forEach(id => {
             let peer = peers[id]
             if (peer.videoElement) {
                 $(peer.videoElement).remove()
             }
         })
 
         // Reset state
         eventHandlers = {}
         camProducer = null
         micProducer = null
         screenProducer = null
         consumers = {}
         peers = {}
     }
 
     this.isJoined = () => {
         return 'self' in peers
     }
 
     this.camMute = async () => {
         if (camProducer) {
             camProducer.pause()
             await socket.sendRequest('pauseProducer', { producerId: camProducer.id })
             trigger('updatePeer', updatePeerState(peers.self))
         }
 
         return this.camStatus()
     }
 
     this.camUnmute = async () => {
         if (camProducer) {
             camProducer.resume()
             await socket.sendRequest('resumeProducer', { producerId: camProducer.id })
             trigger('updatePeer', updatePeerState(peers.self))
         }
 
         return this.camStatus()
     }
 
     this.camStatus = () => {
-        return camProducer && !camProducer.paused && !camProducer.closed
+        return !!(camProducer && !camProducer.paused && !camProducer.closed)
     }
 
     this.micMute = async () => {
         if (micProducer) {
             micProducer.pause()
             await socket.sendRequest('pauseProducer', { producerId: micProducer.id })
             trigger('updatePeer', updatePeerState(peers.self))
         }
 
         return this.micStatus()
     }
 
     this.micUnmute = async () => {
         if (micProducer) {
             micProducer.resume()
             await socket.sendRequest('resumeProducer', { producerId: micProducer.id })
             trigger('updatePeer', updatePeerState(peers.self))
         }
 
         return this.micStatus()
     }
 
     this.micStatus = () => {
-        return micProducer && !micProducer.paused && !micProducer.closed
+        return !!(micProducer && !micProducer.paused && !micProducer.closed)
     }
 
     this.kickPeer = (peerId) => {
         socket.sendRequest('moderator:kickPeer', { peerId })
     }
 
     this.chatMessage = (message) => {
         socket.sendRequest('chatMessage', { message })
     }
 
     this.peerMicMute = (peerId) => {
         Object.values(consumers).forEach(consumer => {
             if (consumer.peerId == peerId && consumer.kind == 'audio' && !consumer.paused) {
                 consumer.pause()
                 socket.sendRequest('pauseConsumer', { consumerId: consumer.id })
             }
         })
     }
 
     this.peerMicUnmute = (peerId) => {
         Object.values(consumers).forEach(consumer => {
             if (consumer.peerId == peerId && consumer.kind == 'audio' && consumer.paused) {
                 consumer.resume()
                 socket.sendRequest('resumeConsumer', { consumerId: consumer.id })
             }
         })
     }
 
     this.raiseHand = async (status) => {
         if (peers.self.raisedHand != status) {
             peers.self.raisedHand = status
             await socket.sendRequest('raisedHand', { raisedHand: status })
             trigger('updatePeer', peers.self, ['raisedHand'])
         }
 
         return status
     }
 
     this.setNickname = (nickname) => {
         if (peers.self.nickname != nickname) {
             peers.self.nickname = nickname
             socket.sendRequest('changeNickname', { nickname })
             trigger('updatePeer', peers.self, ['nickname'])
         }
     }
 
     this.setLanguage = (peerId, language) => {
         socket.sendRequest('moderator:changeLanguage', { peerId, language })
     }
 
     this.addRole = (peerId, role) => {
         socket.sendRequest('moderator:addRole', { peerId, role })
     }
 
     this.removeRole = (peerId, role) => {
         socket.sendRequest('moderator:removeRole', { peerId, role })
     }
 
     /**
      * Register event handlers
      */
     this.on = (eventName, callback) => {
         eventHandlers[eventName] = callback
     }
 
     /**
      * Execute an event handler
      */
     const trigger = (...args) => {
         const eventName = args.shift()
 
         if (eventName in eventHandlers) {
             eventHandlers[eventName].apply(null, args)
         }
     }
 
     const initSocket = (token) => {
         // Connect to websocket
         socket = new Socket(token)
 
         socket.on('disconnect', reason => {
         //    this.closeSession()
         })
 
         socket.on('reconnectFailed', () => {
         //    this.closeSession()
         })
 
         socket.on('request', async (request, cb) => {
             switch (request.method) {
                 case 'newConsumer':
                     const {
                         peerId,
                         producerId,
                         id,
                         kind,
                         rtpParameters,
                         type,
                         appData,
                         producerPaused
                     } = request.data
 
                     const consumer = await recvTransport.consume({
                             id,
                             producerId,
                             kind,
                             rtpParameters
                     })
 
                     consumer.peerId = peerId
 
                     consumer.on('transportclose', () => {
                         // TODO: What actually else needs to be done here?
                         delete consumers[consumer.id]
                     })
 
                     consumers[consumer.id] = consumer
 
                     // We are ready. Answer the request so the server will
                     // resume this Consumer (which was paused for now).
                     cb(null)
 
                     let peer = peers[peerId]
 
                     if (!peer) {
                         return
                     }
 
                     addPeerTrack(peer, consumer.track)
 
                     trigger('updatePeer', peer)
 
                     break
 
                 default:
                     console.error('Unknow request method: ' + request.method)
             }
         })
 
         socket.on('notification', (notification) => {
             switch (notification.method) {
                 case 'roomReady':
                     iceServers = notification.data.iceServers
                     joinRoom()
                     return
 
                 case 'newPeer':
                     peers[notification.data.id] = notification.data
                     trigger('addPeer', notification.data)
                     return
 
                 case 'peerClosed':
                     const { peerId } = notification.data
                     delete peers[peerId]
                     trigger('removePeer', peerId)
                     return
 
                 case 'consumerClosed': {
                     const { consumerId } = notification.data
                     const consumer = consumers[consumerId]
 
                     if (!consumer) {
                         return
                     }
 
                     consumer.close()
 
                     delete consumers[consumerId]
 
                     let peer = peers[consumer.peerId]
 
                     if (peer) {
                         // TODO: Update peer state, remove track
                         trigger('updatePeer', peer)
                     }
 
                     return
                 }
 
                 case 'consumerPaused':
                 case 'consumerResumed': {
                     const { consumerId } = notification.data
                     const consumer = consumers[consumerId]
 
                     if (!consumer) {
                         return
                     }
 
                     consumer[notification.method == 'consumerPaused' ? 'pause' : 'resume']()
 
                     let peer = peers[consumer.peerId]
 
                     if (peer) {
                         trigger('updatePeer', updatePeerState(peer))
                     }
 
                     return
                 }
 
                 case 'changeLanguage':
                     updatePeerProperty(notification.data, 'language')
                     return
 
                 case 'changeNickname':
                     updatePeerProperty(notification.data, 'nickname')
                     return
 
                 case 'changeRole': {
                     const { peerId, role } = notification.data
                     const peer = peers.self.id === peerId ? peers.self : peers[peerId]
 
                     if (!peer) {
                         return
                     }
 
                     let changes = ['role']
 
                     const rolePublisher = role & Roles.PUBLISHER
                     const roleModerator = role & Roles.MODERATOR
                     const isPublisher = peer.role & Roles.PUBLISHER
                     const isModerator = peer.role & Roles.MODERATOR
 
                     if (isPublisher && !rolePublisher) {
                         // demoted to a subscriber
                         changes.push('publisherRole')
 
                         if (peer.isSelf) {
                             // stop publishing any streams
                             this.setMic('', true)
                             this.setCamera('', true)
                         } else {
                             // remove the video element
                             peer.videoElement = null
                             // TODO: Do we need to remove/stop consumers?
                         }
                     } else if (!isPublisher && rolePublisher) {
                         // promoted to a publisher
                         changes.push('publisherRole')
 
                         // create a video element with no tracks
                         setPeerTracks(peer, [])
                     }
 
                     if ((!isModerator && roleModerator) || (isModerator && !roleModerator)) {
                         changes.push('moderatorRole')
                     }
 
                     peer.role = role
 
                     trigger('updatePeer', peer, changes)
                     return
                 }
 
                 case 'chatMessage':
                     notification.data.isSelf = notification.data.peerId == peers.self.id
                     trigger('chatMessage', notification.data)
                     return
 
                 case 'moderator:closeRoom':
                     this.closeSession('session-closed')
                     return
 
                 case 'moderator:kickPeer':
                     this.closeSession('session-closed')
                     return
 
                 case 'raisedHand':
                     updatePeerProperty(notification.data, 'raisedHand')
                     return
 
                 case 'signal:joinRequest':
                     trigger('joinRequest', notification.data)
                     return
 
                 default:
                     console.error('Unknow notification method: ' + notification.method)
             }
         })
 
         return socket
     }
 
     const joinRoom = async () => {
         const routerRtpCapabilities = await socket.getRtpCapabilities()
 
         routerRtpCapabilities.headerExtensions = routerRtpCapabilities.headerExtensions
             .filter(ext => ext.uri !== 'urn:3gpp:video-orientation')
 
         await device.load({ routerRtpCapabilities })
 
         // Setup the consuming transport (for handling streams of other participants)
         await setRecvTransport()
 
         // Send the "join" request, get room data, participants, etc.
         const { peers: existing, role, id: peerId } = await socket.sendRequest('join', {
                 nickname: joinProps.nickname,
                 rtpCapabilities: device.rtpCapabilities
         })
 
         trigger('joinSuccess')
 
         let peer = {
             id: peerId,
             role,
             nickname: joinProps.nickname,
+            audioActive: false,
+            videoActive: false,
             isSelf: true
         }
 
         // Add self to the list
         peers.self = peer
 
         // Start publishing webcam and mic (and setup the producing transport)
         await this.setCamera(joinProps.videoSource, true)
         await this.setMic(joinProps.audioSource, true)
 
         updatePeerState(peer)
 
         trigger('addPeer', peer)
 
         // Trigger addPeer event for all peers already in the room, maintain peers list
         existing.forEach(peer => {
             let tracks = []
 
             // We receive newConsumer requests before we add the peer to peers list,
             // therefore we look here for any consumers that belong to this peer and update
             // the peer. If we do not do this we have to wait about 20 seconds for repeated
             // newConsumer requests
             Object.keys(consumers).forEach(cid => {
                 if (consumers[cid].peerId === peer.id) {
                     tracks.push(consumers[cid].track)
                 }
             })
 
             if (tracks.length) {
                 setPeerTracks(peer, tracks)
             }
 
             peers[peer.id] = peer
 
             trigger('addPeer', peer)
         })
     }
 
     this.setCamera = async (deviceId, noUpdate) => {
         // Actually selected device, do nothing
         if (deviceId == videoSource) {
             return
         }
 
         // Remove current device, stop producer
         if (camProducer && !camProducer.closed) {
             camProducer.close()
             await socket.sendRequest('closeProducer', { producerId: camProducer.id })
             setPeerTracks(peers.self, [])
         }
 
         peers.self.videoSource = videoSource = deviceId
 
         if (!deviceId) {
             if (!noUpdate) {
                 trigger('updatePeer', updatePeerState(peers.self), ['videoSource'])
             }
             return
         }
 
         if (!device.canProduce('video')) {
             throw new Error('cannot produce video')
         }
 
         const { aspectRatio, frameRate, resolution } = Config.videoOptions
 
         const track = await media.getTrack({
             video: {
                 deviceId: { ideal: deviceId },
                 ...VIDEO_CONSTRAINTS[resolution],
                 frameRate
             }
         })
 
         await setSendTransport()
 
         // TODO: Simulcast support?
 
         camProducer = await sendTransport.produce({
             track,
             appData: {
                 source : 'webcam'
             }
         })
 /*
         camProducer.on('transportclose', () => {
             camProducer = null
         })
 
         camProducer.on('trackended', () => {
             // disableWebcam()
         })
 */
         // Create/Update the video element
         addPeerTrack(peers.self, track)
         if (!noUpdate) {
             trigger('updatePeer', peers.self, ['videoSource'])
         }
     }
 
     this.setMic = async (deviceId, noUpdate) => {
         // Actually selected device, do nothing
         if (deviceId == audioSource) {
             return
         }
 
         // Remove current device, stop producer
         if (micProducer && !micProducer.closed) {
             micProducer.close()
             await socket.sendRequest('closeProducer', { producerId: micProducer.id })
         }
 
         peers.self.audioSource = audioSource = deviceId
 
         if (!deviceId) {
             if (!noUpdate) {
                 trigger('updatePeer', updatePeerState(peers.self), ['audioSource'])
             }
             return
         }
 
         if (!device.canProduce('audio')) {
             throw new Error('cannot produce audio')
         }
 
         const {
             autoGainControl,
             echoCancellation,
             noiseSuppression,
             sampleRate,
             channelCount,
             volume,
             sampleSize,
             opusStereo,
             opusDtx,
             opusFec,
             opusPtime,
             opusMaxPlaybackRate
         } = Config.audioOptions
 
         const track = await media.getTrack({
             audio: {
                 sampleRate,
                 channelCount,
                 volume,
                 autoGainControl,
                 echoCancellation,
                 noiseSuppression,
                 sampleSize,
                 deviceId: { ideal: deviceId }
             }
         })
 
         await setSendTransport()
 
         micProducer = await sendTransport.produce({
             track,
             codecOptions: {
                 opusStereo,
                 opusDtx,
                 opusFec,
                 opusPtime,
                 opusMaxPlaybackRate
             },
             appData: {
                 source : 'mic'
             }
         })
 /*
         micProducer.on('transportclose', () => {
             micProducer = null
         })
 
         micProducer.on('trackended', () => {
             // disableMic()
         })
 */
         // Note: We're not adding this track to the video element
         if (!noUpdate) {
             trigger('updatePeer', updatePeerState(peers.self), ['audioSource'])
         }
     }
 
     const setPeerTracks = (peer, tracks) => {
         if (!peer.videoElement) {
             peer.videoElement = media.createVideoElement(tracks, { mirror: peer.isSelf })
         } else {
             const stream = new MediaStream()
             tracks.forEach(track => stream.addTrack(track))
             peer.videoElement.srcObject = stream
         }
 
         updatePeerState(peer)
     }
 
     const addPeerTrack = (peer, track) => {
         if (!peer.videoElement) {
             setPeerTracks(peer, [ track ])
             return
         }
 
         const stream = peer.videoElement.srcObject
 
         if (track.kind == 'video') {
             media.removeTracksFromStream(stream, 'Video')
         } else {
             media.removeTracksFromStream(stream, 'Audio')
         }
 
         stream.addTrack(track)
 
         updatePeerState(peer)
     }
 
     const updatePeerState = (peer) => {
         if (peer.isSelf) {
             peer.videoActive = this.camStatus()
             peer.audioActive = this.micStatus()
         } else {
             peer.videoActive = false
             peer.audioActive = false
 
             Object.keys(consumers).forEach(cid => {
                 const consumer = consumers[cid]
 
                 if (consumer.peerId == peer.id) {
                     peer[consumer.kind + 'Active'] = !consumer.paused && !consumer.closed && !consumer.producerPaused
                 }
             })
         }
 
         return peer
     }
 
     const setSendTransport = async () => {
         if (sendTransport && !sendTransport.closed) {
             return
         }
 
         if (!sendTransportInfo) {
             sendTransportInfo = await socket.sendRequest('createWebRtcTransport', {
                     forceTcp: false,
                     producing: true,
                     consuming: false
             })
         }
 
         const { id, iceParameters, iceCandidates, dtlsParameters } = sendTransportInfo
 
         const iceTransportPolicy = (device.handlerName.toLowerCase().includes('firefox') && iceServers) ? 'relay' : undefined
 
         sendTransport = device.createSendTransport({
             id,
             iceParameters,
             iceCandidates,
             dtlsParameters,
             iceServers,
             iceTransportPolicy,
             proprietaryConstraints: { optional: [{ googDscp: true }] }
         })
 
         sendTransport.on('connect', ({ dtlsParameters }, callback, errback) => {
             socket.sendRequest('connectWebRtcTransport', { transportId: sendTransport.id, dtlsParameters })
                 .then(callback)
                 .catch(errback)
         })
 
         sendTransport.on('produce', async ({ kind, rtpParameters, appData }, callback, errback) => {
             try {
                 const { id } = await socket.sendRequest('produce', {
                     transportId: sendTransport.id,
                     kind,
                     rtpParameters,
                     appData
                 })
                 callback({ id })
             } catch (error) {
                 errback(error)
             }
         })
     }
 
     const setRecvTransport = async () => {
         const transportInfo = await socket.sendRequest('createWebRtcTransport', {
                 forceTcp: false,
                 producing: false,
                 consuming: true
         })
 
         const { id, iceParameters, iceCandidates, dtlsParameters } = transportInfo
 
         const iceTransportPolicy = (device.handlerName.toLowerCase().includes('firefox') && iceServers) ? 'relay' : undefined
 
         recvTransport = device.createRecvTransport({
                 id,
                 iceParameters,
                 iceCandidates,
                 dtlsParameters,
                 iceServers,
                 iceTransportPolicy
         })
 
         recvTransport.on('connect', ({ dtlsParameters }, callback, errback) => {
             socket.sendRequest('connectWebRtcTransport', { transportId: recvTransport.id, dtlsParameters })
                 .then(callback)
                 .catch(errback)
         })
     }
 
     const updatePeerProperty = (data, prop) => {
         const peerId = data.peerId
         const peer = peers.self.id === peerId ? peers.self : peers[peerId]
 
         if (!peer) {
             return
         }
 
         peer[prop] = data[prop]
 
         trigger('updatePeer', peer, [ prop ])
     }
 }
 
 export { Client }
diff --git a/src/resources/js/meet/media.js b/src/resources/js/meet/media.js
index cca698c5..65654c6e 100644
--- a/src/resources/js/meet/media.js
+++ b/src/resources/js/meet/media.js
@@ -1,378 +1,394 @@
 'use strict'
 
 function Media()
 {
     let audioActive = false     // True if the audio track is active
     let videoActive = false     // True if the video track is active
     let audioSource = ''        // Current audio device identifier
     let videoSource = ''        // Current video device identifier
     let cameras = []            // List of user video devices
     let microphones = []        // List of user audio devices
     let setupVideoElement       // <video> element for setup process
     let setupVolumeElement      // Volume indicator element for setup process
 
 
     this.getAudioDevices = async () => {
         let audioDevices = {}
 
         try
         {
             const devices = await navigator.mediaDevices.enumerateDevices()
 
             for (const device of devices) {
                 if (device.kind !== 'audioinput') {
                     continue
                 }
 
                 audioDevices[device.deviceId] = device
             }
         }
         catch (error) {
             console.error(error)
         }
 
         return audioDevices
     }
 
     this.getWebcams = async () => {
         let webcamDevices = {}
 
         try {
             const devices = await navigator.mediaDevices.enumerateDevices()
 
             for (const device of devices) {
                 if (device.kind !== 'videoinput') {
                     continue
                 }
 
                 webcamDevices[device.deviceId] = device
             }
         }
         catch (error) {
             console.error(error)
         }
 
         return webcamDevices
     }
 
-    this.getMediaStream = async (successCallback, errorCallback) => {
-        navigator.mediaDevices.getUserMedia({ audio: true, video: true })
+    this.getMediaStream = async (successCallback, errorCallback, props) => {
+        const constraints = { audio: true, video: true }
+
+        if (props && props.videoSource)
+            constraints.video = { deviceId: props.videoSource }
+        if (props && props.audioSource)
+            constraints.audio = { deviceId: props.audioSource }
+
+        navigator.mediaDevices.getUserMedia(constraints)
             .then(mediaStream => {
                 successCallback(mediaStream)
             })
             .catch(error => {
                 errorCallback(error)
             })
     }
 
     this.getTrack = async (constraints) => {
         const stream = await navigator.mediaDevices.getUserMedia(constraints)
 
         if (constraints['audio']) {
             return stream.getAudioTracks()[0]
         }
 
         return stream.getVideoTracks()[0]
     }
 
     this.createVideoElement = (tracks, props) => {
         const videoElement = document.createElement('video')
 
         const stream = new MediaStream()
 
         tracks.forEach(track => stream.addTrack(track))
 
         videoElement.srcObject = stream
 
         this.setVideoProps(videoElement, props)
 
         return videoElement
     }
 
     this.makePicture = (videoElement) => {
         // Skip if video is not "playing"
         if (!videoElement.videoWidth) {
             return
         }
 
         // we're going to crop a square from the video and resize it
         const maxSize = 64
 
         // Calculate sizing
         let sh = Math.floor(videoElement.videoHeight / 1.5)
         let sw = sh
         let sx = (videoElement.videoWidth - sw) / 2
         let sy = (videoElement.videoHeight - sh) / 2
 
         let dh = Math.min(sh, maxSize)
         let dw = sh < maxSize ? sw : Math.floor(sw * dh/sh)
 
         const canvas = $("<canvas>")[0]
         canvas.width = dw
         canvas.height = dh
 
         // draw the image on the canvas (square cropped and resized)
         canvas.getContext('2d').drawImage(videoElement, sx, sy, sw, sh, 0, 0, dw, dh)
 
         // convert it to a usable data URL (png format)
         return canvas.toDataURL()
     }
 
     this.setVideoProps = (videoElement, props) => {
         videoElement.autoplay = true
         videoElement.controls = false
         videoElement.muted = props.muted || false
         videoElement.disablePictureInPicture = true // this does not work in Firefox
         videoElement.tabIndex = -1
         videoElement.setAttribute('playsinline', 'true')
 
         if (props.mirror) {
             videoElement.style.transform = 'rotateY(180deg)'
             videoElement.style.webkitTransform = 'rotateY(180deg)'
         }
     }
 
     /**
      * Sets the audio and video devices for the session.
      * This will ask user for permission to access media devices.
      *
      * @param props Setup properties (videoElement, volumeElement, onSuccess, onError)
      */
     this.setupStart = (props) => {
         setupVideoElement = props.videoElement
         setupVolumeElement = props.volumeElement
 
         const callback = async (mediaStream) => {
+            if (props.audioActive === false) {
+                this.removeTracksFromStream(mediaStream, 'Audio')
+            }
+            if (props.videoActive === false) {
+                this.removeTracksFromStream(mediaStream, 'Video')
+            }
+
             let videoStream = mediaStream.getVideoTracks()[0]
             let audioStream = mediaStream.getAudioTracks()[0]
 
             audioActive = !!audioStream
             videoActive = !!videoStream
 
             this.setVideoProps(setupVideoElement, { mirror: true, muted: true })
             setupVideoElement.srcObject = mediaStream
 
-            volumeMeterStart()
+            if (audioActive) {
+                volumeMeterStart()
+            }
 
             microphones = await this.getAudioDevices()
             cameras = await this.getWebcams()
 
             Object.keys(cameras).forEach(deviceId => {
                 // device's props: deviceId, kind, label
                 const device = cameras[deviceId]
                 if (videoStream && videoStream.label == device.label) {
                     videoSource = device.deviceId
                 }
             })
 
             Object.keys(microphones).forEach(deviceId => {
                 const device = microphones[deviceId]
                 if (audioStream && audioStream.label == device.label) {
                     audioSource = device.deviceId
                 }
             })
 
             props.onSuccess({
                 microphones,
                 cameras,
                 audioSource,
                 videoSource,
                 audioActive,
                 videoActive
             })
         }
 
-        this.getMediaStream(callback, props.onError)
+        this.getMediaStream(callback, props.onError, props)
     }
 
     /**
      * Stop the setup "process", cleanup after it.
      */
     this.setupStop = () => {
         volumeMeterStop()
 
         // Unset the video element tracks
         if (setupVideoElement) {
             const mediaStream = new MediaStream()
             setupVideoElement.srcObject = mediaStream
         }
     }
 
     this.setupData = () => {
         return {
             microphones,
             cameras,
             audioSource,
             videoSource,
             audioActive,
             videoActive
         }
     }
 
     /**
      * Change the publisher audio device
      *
      * @param deviceId Device identifier string
      */
     this.setupSetAudio = async (deviceId) => {
         const mediaStream = setupVideoElement.srcObject
 
         if (!deviceId) {
             volumeMeterStop()
             this.removeTracksFromStream(mediaStream, 'Audio')
             audioActive = false
             audioSource = ''
         } else if (deviceId == audioSource) {
             volumeMeterStart()
             audioActive = true
         } else {
             const constraints = {
                 audio: {
                     deviceId: { ideal: deviceId }
                 }
             }
 
             volumeMeterStop()
 
             // Stop and remove the old track, otherwise you get "Concurrent mic process limit." error
             this.removeTracksFromStream(mediaStream, 'Audio')
 
             // TODO: Error handling
 
             const track = await this.getTrack(constraints)
 
             mediaStream.addTrack(track)
             volumeMeterStart()
             audioActive = true
             audioSource = deviceId
         }
 
         return audioActive
     }
 
     /**
      * Change the publisher video device
      *
      * @param deviceId Device identifier string
      */
     this.setupSetVideo = async (deviceId) => {
         const mediaStream = setupVideoElement.srcObject
 
         if (!deviceId) {
             this.removeTracksFromStream(mediaStream, 'Video')
             // Without the next line the video element will freeze on the last video frame
             // instead of turning black.
             setupVideoElement.srcObject = mediaStream
             videoActive = false
             videoSource = ''
         } else if (deviceId == audioSource) {
             videoActive = true
         } else {
             const constraints = {
                 video: {
                     deviceId: { ideal: deviceId }
                 }
             }
 
             // Stop and remove the old track, otherwise you get "Concurrent mic process limit." error
             this.removeTracksFromStream(mediaStream, 'Video')
 
             // TODO: Error handling
 
             const track = await this.getTrack(constraints)
 
             mediaStream.addTrack(track)
             videoActive = true
             videoSource = deviceId
         }
 
         return videoActive
     }
 
     this.removeTracksFromStream = (stream, type) => {
         if (stream) {
             stream[`get${type}Tracks`]().forEach(track => {
                 track.stop()
                 stream.removeTrack(track)
             })
         }
     }
 
     const volumeMeterStart = () => {
         if (!setupVolumeElement) {
             return
         }
 
         const audioContext = new AudioContext()
         const source = audioContext.createMediaStreamSource(setupVideoElement.srcObject)
 
         // Create a new volume meter
         const processor = audioContext.createScriptProcessor(512)
 
         processor.volume = 0
         processor.averaging = 0.95
 
         processor.onaudioprocess = function(event) {
             let buf = event.inputBuffer.getChannelData(0)
             let bufLength = buf.length
             let sum = 0
 
             // Do a root-mean-square on the samples: sum up the squares...
             for (let x, i=0; i<bufLength; i++) {
                 x = buf[i]
                 sum += x * x
             }
 
             // ... then take the square root of the sum.
             const rms = Math.sqrt(sum / bufLength)
 
             // Now smooth this out with the averaging factor applied
             // to the previous sample - take the max here because we
             // want "fast attack, slow release."
             this.volume = Math.max(rms, this.volume * this.averaging)
         }
 
         processor.shutdown = function() {
             this.disconnect()
             this.onaudioprocess = null
         }
 
         // this will have no effect, since we don't copy the input to the output,
         // but works around a current Chrome bug.
         processor.connect(audioContext.destination)
 
         // Connect the volume processor to the source
         source.connect(processor)
 
         const update = () => { volumeMeterUpdate(processor.volume  * 100) }
 
         this.audioContext = audioContext
         this.volumeInterval = setInterval(update, 25)
     }
 
     const volumeMeterStop = () => {
         if (this.audioContext) {
             clearInterval(this.volumeInterval)
             this.audioContext.close()
             this.audioContext = null
             volumeMeterUpdate(0)
         }
     }
 
     const volumeMeterUpdate = (volume) => {
         const value = Math.min(100, Math.ceil(volume))
         const bar = setupVolumeElement.firstChild
 
         let color = 'lime'
         if (value >= 70) {
             color = '#ff3300'
         } else if (value >= 50) {
             color = '#ff9933'
         }
 
         bar.style.height = value + '%'
         bar.style.background = color
     }
 }
 
 export { Media }
diff --git a/src/resources/js/meet/room.js b/src/resources/js/meet/room.js
index e694dd2b..0cc75ec1 100644
--- a/src/resources/js/meet/room.js
+++ b/src/resources/js/meet/room.js
@@ -1,1078 +1,1099 @@
 'use strict'
 
 import anchorme from 'anchorme'
 import { Client } from './client.js'
 import { Roles } from './constants.js'
 import { Dropdown } from 'bootstrap'
 import { library } from '@fortawesome/fontawesome-svg-core'
 
 function Room(container)
 {
     let sessionData             // Room session metadata
     let peers = {}              // Participants in the session (including self)
     let publishersContainer     // Container element for publishers
     let subscribersContainer    // Container element for subscribers
+    let selfId                  // peerId of the current user
 
     let chatCount = 0
     let scrollStop
     let $t
 
     const client = new Client()
 
     // Disconnect participant when browser's window close
     window.addEventListener('beforeunload', () => {
         leaveRoom()
     })
 
     window.addEventListener('resize', resize)
 
     // Public methods
     this.isScreenSharingSupported = isScreenSharingSupported
     this.joinRoom = joinRoom
     this.leaveRoom = leaveRoom
     this.raiseHand = raiseHand
     this.setupStart = setupStart
     this.setupStop = setupStop
     this.setupSetAudioDevice = setupSetAudioDevice
     this.setupSetVideoDevice = setupSetVideoDevice
     this.switchAudio = switchAudio
     this.switchChannel = switchChannel
     this.switchScreen = switchScreen
     this.switchVideo = switchVideo
 
     /**
      * Join the room session
      *
      * @param data Session metadata and event handlers:
      *      token           - A token for the main connection,
-     *      shareToken      - A token for screen-sharing connection,
      *      nickname        - Participant name,
      *      languages       - Supported languages (code-to-label map)
      *      chatElement     - DOM element for the chat widget,
      *      counterElement  - DOM element for the participants counter,
      *      menuElement     - DOM element of the room toolbar,
      *      queueElement    - DOM element for the Q&A queue (users with a raised hand)
      *      onSuccess       - Callback for session connection (join) success
      *      onError         - Callback for session connection (join) error
      *      onDestroy       - Callback for session disconnection event,
      *      onJoinRequest   - Callback for join request,
-     *      onUpdate        - Callback for current user/session update,
      *      onMediaSetup    - Called when user clicks the Media setup button
+     *      onUpdate        - Callback for current user/session update,
      *      translate       - Translation function
      */
     function joinRoom(data) {
         // Create a container for subscribers and publishers
         publishersContainer = $('<div id="meet-publishers">').appendTo(container).get(0)
         subscribersContainer = $('<div id="meet-subscribers">').appendTo(container).get(0)
 
         resize();
 
         $t = data.translate
 
         // Make sure all supported callbacks exist, so we don't have to check
         // their existence everywhere anymore
         let events = ['Success', 'Error', 'Destroy', 'JoinRequest', 'SessionDataUpdate', 'MediaSetup']
 
         events.map(event => 'on' + event).forEach(event => {
             if (!data[event]) {
                 data[event] = () => {}
             }
         })
 
         sessionData = data
 
         // Participant added (including self)
         client.on('addPeer', (event) => {
             console.log('addPeer', event)
 
             event.element = participantCreate(event)
 
             peers[event.id] = event
 
+            if (event.isSelf) {
+                selfId = event.id
+            }
+
             updateSession()
         })
 
         // Participant removed
         client.on('removePeer', (peerId) => {
             console.log('removePeer', peerId)
 
             let peer = peers[peerId]
 
             if (peer) {
                 // Remove elements related to the participant
                 peerHandDown(peer)
                 $(peer.element).remove()
                 delete peers[peerId]
             }
 
             updateSession()
 
             resize()
         })
 
         // Participant properties changed e.g. audio/video muted/unmuted
         client.on('updatePeer', (event, changed) => {
             console.log('updatePeer', event)
 
             let peer = peers[event.id]
 
             if (!peer) {
                 return
             }
 
             event.element = peer.element
 
             if (event.videoElement && event.videoElement.parentNode != event.element) {
                 $(event.element).prepend(event.videoElement)
             } else if (!event.videoElement) {
                 $(event.element).find('video').remove()
             }
 
             if (changed && changed.length) {
                 if (changed && changed.includes('nickname')) {
                      nicknameUpdate(event.nickname, event.id)
                 }
 
                 if (changed.includes('raisedHand')) {
                      if (event.raisedHand) {
                         peerHandUp(event)
                     } else {
                         peerHandDown(event)
                     }
                 }
             }
 
             event.element = participantUpdate(event.element, event)
 
             // It's me, got publisher role
             if (peer.isSelf && (event.role & Roles.PUBLISHER) && changed && changed.includes('publisherRole')) {
                 // Open the media setup dialog
                 sessionData.onMediaSetup()
             }
 
             peers[event.id] = event
 
             updateSession(changed && changed.includes('moderatorRole'))
         })
 
         client.on('joinSuccess', () => {
             data.onSuccess()
             client.media.setupStop()
         })
 
         client.on('joinRequest', event => {
             data.onJoinRequest(event)
         })
 
         // Handle session disconnection events
         client.on('closeSession', event => {
             // Notify the UI
             data.onDestroy(event)
 
             // Remove all participant elements
             Object.keys(peers).forEach(peerId => {
                 $(peers[peerId].element).remove()
             })
             peers = {}
 
             // refresh the matrix
             resize()
         })
 
         const { audioSource, videoSource } = client.media.setupData()
 
         // Start the session
         client.joinSession(data.token, { videoSource, audioSource, nickname: data.nickname })
 
         // Prepare the chat
         initChat()
     }
 
     /**
      * Leave the room (disconnect)
      */
     function leaveRoom(forced) {
         client.closeSession(forced)
         peers = {}
     }
 
     /**
      * Raise or lower the hand
      *
      * @param status Hand raised or not
      */
     async function raiseHand(status) {
         return await client.raiseHand(status)
     }
 
     /**
      * Sets the audio and video devices for the session.
      * This will ask user for permission to access media devices.
      *
      * @param props Setup properties (videoElement, volumeElement, onSuccess, onError)
      */
     function setupStart(props) {
+        // set default media state
+        if (client.isJoined()) {
+            props.audioSource = sessionData.audioSource
+            props.videoSource = sessionData.videoSource
+            props.audioActive = sessionData.audioActive
+            props.videoActive = sessionData.videoActive
+        }
+
         client.media.setupStart(props)
 
         // When setting up devices while the session is ongoing we have to
         // disable currently selected devices (temporarily) otherwise e.g.
         // changing a mic or camera to another device will not be possible.
         if (client.isJoined()) {
             client.setMic('')
             client.setCamera('')
         }
     }
 
     /**
      * Stop the setup "process", cleanup after it.
      */
     async function setupStop() {
         client.media.setupStop()
 
         // Apply device changes to the client
         const { audioSource, videoSource } = client.media.setupData()
         await client.setMic(audioSource)
         await client.setCamera(videoSource)
     }
 
     /**
      * Change the publisher audio device
      *
      * @param deviceId Device identifier string
      */
     async function setupSetAudioDevice(deviceId) {
         return await client.media.setupSetAudio(deviceId)
     }
 
     /**
      * Change the publisher video device
      *
      * @param deviceId Device identifier string
      */
     async function setupSetVideoDevice(deviceId) {
         return await client.media.setupSetVideo(deviceId)
     }
 
     /**
      * Setup the chat UI
      */
     function initChat() {
         // Handle arriving chat messages
         client.on('chatMessage', pushChatMessage)
 
         // The UI elements are created in the vue template
         // Here we add a logic for how they work
 
         const chat = $(sessionData.chatElement).find('.chat').get(0)
         const textarea = $(sessionData.chatElement).find('textarea')
         const button = $(sessionData.menuElement).find('.link-chat')
 
         textarea.on('keydown', e => {
             if (e.keyCode == 13 && !e.shiftKey) {
                 if (textarea.val().length) {
                     client.chatMessage(textarea.val())
                     textarea.val('')
                 }
 
                 return false
             }
         })
 
         // Add an element for the count of unread messages on the chat button
         button.append('<span class="badge badge-dark blinker">')
             .on('click', () => {
                 button.find('.badge').text('')
                 chatCount = 0
                 // When opening the chat scroll it to the bottom, or we shouldn't?
                 scrollStop = false
                 chat.scrollTop = chat.scrollHeight
             })
 
         $(chat).on('scroll', event => {
             // Detect manual scrollbar moves, disable auto-scrolling until
             // the scrollbar is positioned on the element bottom again
             scrollStop = chat.scrollTop + chat.offsetHeight < chat.scrollHeight
         })
     }
 
     /**
      * Add a message to the chat
      *
      * @param data Object with a message, nickname, id (of the connection, empty for self)
      */
     function pushChatMessage(data) {
         let message = $('<span>').text(data.message).text() // make the message secure
 
         // Format the message, convert emails and urls to links
         message = anchorme({
             input: message,
             options: {
                 attributes: {
                     target: "_blank"
                 },
                 // any link above 20 characters will be truncated
                 // to 20 characters and ellipses at the end
                 truncate: 20,
                 // characters will be taken out of the middle
                 middleTruncation: true
             }
             // TODO: anchorme is extensible, we could support
             //       github/phabricator's markup e.g. backticks for code samples
         })
 
         message = message.replace(/\r?\n/, '<br>')
 
         // Display the message
         let chat = $(sessionData.chatElement).find('.chat')
         let box = chat.find('.message').last()
 
         message = $('<div>').html(message)
 
         message.find('a').attr('rel', 'noreferrer')
 
         if (box.length && box.data('id') == data.peerId) {
             // A message from the same user as the last message, no new box needed
             message.appendTo(box)
         } else {
             box = $('<div class="message">').data('id', data.peerId)
                 .append($('<div class="nickname">').text(data.nickname || ''))
                 .append(message)
                 .appendTo(chat)
 
             if (data.isSelf) {
                 box.addClass('self')
             }
         }
 
         // Count unread messages
         if (!$(sessionData.chatElement).is('.open')) {
             if (!data.isSelf) {
                 chatCount++
             }
         } else {
             chatCount = 0
         }
 
         $(sessionData.menuElement).find('.link-chat .badge').text(chatCount ? chatCount : '')
 
         // Scroll the chat element to the end
         if (!scrollStop) {
             chat.get(0).scrollTop = chat.get(0).scrollHeight
         }
     }
 
     /**
      * Switch interpreted language channel
      *
      * @param channel Two-letter language code
      */
     function switchChannel(channel) {
         sessionData.channel = channel
         updateSession(true)
     }
 
     /**
      * Mute/Unmute audio for current session publisher
      */
     async function switchAudio() {
         const isActive = client.micStatus()
 
         if (isActive) {
             return await client.micMute()
         } else {
             return await client.micUnmute()
         }
     }
 
     /**
      * Mute/Unmute video for current session publisher
      */
     async function switchVideo() {
         const isActive = client.camStatus()
 
         if (isActive) {
             return await client.camMute()
         } else {
             return await client.camUnmute()
         }
     }
 
     /**
      * Switch on/off screen sharing
      */
     function switchScreen(callback) {
         // TODO
     }
 
     /**
      * Detect if screen sharing is supported by the browser
      */
     function isScreenSharingSupported() {
         return false // TODO !!(navigator.mediaDevices && navigator.mediaDevices.getDisplayMedia)
     }
 
     /**
      * Handler for Hand-Up "signal"
      */
     function peerHandUp(peer) {
         let element = $(nicknameWidget(peer))
 
         participantUpdate(element, peer)
 
         element.attr('id', 'qa' + peer.id)
             .appendTo($(sessionData.queueElement).show())
 
         setTimeout(() => element.addClass('widdle'), 50)
     }
 
     /**
      * Handler for Hand-Down "signal"
      */
     function peerHandDown(peer) {
         let list = $(sessionData.queueElement)
 
         list.find('#qa' + peer.id).remove();
 
         if (!list.find('.meet-nickname').length) {
             list.hide();
         }
     }
 
     /**
      * Update participant nickname in the UI
      *
      * @param nickname Nickname
      * @param peerId   Connection identifier of the user
      */
     function nicknameUpdate(nickname, peerId) {
         if (peerId) {
             $(sessionData.chatElement).find('.chat').find('.message').each(function() {
                 let elem = $(this)
                 if (elem.data('id') == peerId) {
                     elem.find('.nickname').text(nickname || '')
                 }
             })
 
             $(sessionData.queueElement).find('#qa' + peerId + ' .content').text(nickname || '')
         }
     }
 
     /**
      * Create a participant element in the matrix. Depending on the peer role
      * parameter it will be a video element wrapper inside the matrix or a simple
      * tag-like element on the subscribers list.
      *
      * @param params  Peer metadata/params
      * @param content Optional content to prepend to the element
      *
      * @return The element
      */
     function participantCreate(params, content) {
         let element
 
         if ((!params.language && params.role & Roles.PUBLISHER) || params.role & Roles.SCREEN) {
             // publishers and shared screens
             element = publisherCreate(params, content)
 
             if (params.videoElement) {
                 $(element).prepend(params.videoElement)
             }
         } else {
             // subscribers and language interpreters
             element = subscriberCreate(params, content)
         }
 
         setTimeout(resize, 50);
 
         return element
     }
 
     /**
      * Create a <video> element wrapper with controls
      *
      * @param params  Connection metadata/params
      * @param content Optional content to prepend to the element
      */
     function publisherCreate(params, content) {
         let isScreen = params.role & Roles.SCREEN
 
         // Create the element
         let wrapper = $(
             '<div class="meet-video">'
             + svgIcon('user', 'fas', 'watermark')
             + '<div class="controls">'
                 + '<button type="button" class="btn btn-link link-setup hidden" title="' + $t('meet.media-setup') + '">' + svgIcon('cog') + '</button>'
                 + '<div class="volume hidden"><input type="range" min="0" max="1" step="0.1" /></div>'
                 + '<button type="button" class="btn btn-link link-audio hidden" title="' + $t('meet.menu-audio-mute') + '">' + svgIcon('volume-mute') + '</button>'
                 + '<button type="button" class="btn btn-link link-fullscreen closed hidden" title="' + $t('meet.menu-fullscreen') + '">' + svgIcon('expand') + '</button>'
                 + '<button type="button" class="btn btn-link link-fullscreen open hidden" title="' + $t('meet.menu-fullscreen') + '">' + svgIcon('compress') + '</button>'
             + '</div>'
             + '<div class="status">'
                 + '<span class="bg-warning status-audio hidden">' + svgIcon('microphone-slash') + '</span>'
                 + '<span class="bg-warning status-video hidden">' + svgIcon('video-slash') + '</span>'
             + '</div>'
             + '</div>'
         )
 
         // Append the nickname widget
         wrapper.find('.controls').before(nicknameWidget(params))
 
         if (content) {
             wrapper.prepend(content)
         }
 
         if (isScreen) {
             wrapper.addClass('screen')
         }
 
         if (params.isSelf) {
             wrapper.find('.link-setup').removeClass('hidden').on('click', () => sessionData.onMediaSetup())
         } else {
             let volumeInput = wrapper.find('.volume input')
             let audioButton = wrapper.find('.link-audio')
             let inVolume = false
             let hideVolumeTimeout
             let hideVolume = () => {
                 if (inVolume) {
                     hideVolumeTimeout = setTimeout(hideVolume, 1000)
                 } else {
                     volumeInput.parent().addClass('hidden')
                 }
             }
             let setVolume = (video, volume) => {
                 video.volume = volume
                 video.muted = volume == 0
                 audioButton[video.muted ? 'addClass' : 'removeClass']('text-danger')
                 client[video.muted ? 'peerMicMute' : 'peerMicUnmute'](params.id)
             }
 
             // Enable and set up the audio mute button
             audioButton.removeClass('hidden')
                 .on('click', e => {
                     let video = wrapper.find('video')[0]
                     setVolume(video, !video.muted ? 0 : 1)
                     volumeInput.val(video.volume)
                 })
                 // Show the volume slider when mouse is over the audio mute/unmute button
                 .on('mouseenter', () => {
                     let video = wrapper.find('video')[0]
 
                     clearTimeout(hideVolumeTimeout)
                     volumeInput.parent().removeClass('hidden')
                     volumeInput.val(video.volume)
                 })
                 .on('mouseleave', () => {
                     hideVolumeTimeout = setTimeout(hideVolume, 1000)
                 })
 
             // Set up the audio volume control
             volumeInput
                 .on('mouseenter', () => { inVolume = true })
                 .on('mouseleave', () => { inVolume = false })
                 .on('change input', () => {
                     setVolume(wrapper.find('video')[0], volumeInput.val())
                 })
         }
 
         participantUpdate(wrapper, params, true)
 
         // Fullscreen control
         if (document.fullscreenEnabled) {
             wrapper.find('.link-fullscreen.closed').removeClass('hidden')
                 .on('click', () => {
                     wrapper.get(0).requestFullscreen()
                 })
 
             wrapper.find('.link-fullscreen.open')
                 .on('click', () => {
                     document.exitFullscreen()
                 })
 
             wrapper.on('fullscreenchange', () => {
                 // const enabled = document.fullscreenElement
                 wrapper.find('.link-fullscreen').toggleClass('hidden')
             })
         }
 
         // Remove the subscriber element, if exists
         $('#subscriber-' + params.id).remove()
 
         let prio = params.isSelf || (isScreen && !$(publishersContainer).children('.screen').length)
 
         return wrapper[prio ? 'prependTo' : 'appendTo'](publishersContainer)
             .attr('id', 'publisher-' + params.id)
             .get(0)
     }
 
     /**
      * Update the publisher/subscriber element controls
      *
      * @param wrapper The wrapper element
      * @param params  Peer metadata/params
      */
     function participantUpdate(wrapper, params, noupdate) {
         const element = $(wrapper)
         const isModerator = params.role & Roles.MODERATOR
         const isSelf = params.isSelf
         const rolePublisher = params.role & Roles.PUBLISHER
         const roleModerator = params.role & Roles.MODERATOR
         const roleScreen = params.role & Roles.SCREEN
         const roleOwner = params.role & Roles.OWNER
         const roleInterpreter = rolePublisher && !!params.language
 
         if (!noupdate && !roleScreen) {
             const isPublisher = element.is('.meet-video')
 
             // Publisher-to-interpreter or vice-versa, move element to the subscribers list or vice-versa,
             // but keep the existing video element
             if (
                 !isSelf
                 && element.find('video').length
                 && ((roleInterpreter && isPublisher) || (!roleInterpreter && !isPublisher && rolePublisher))
             ) {
                 wrapper = participantCreate(params, element.find('video'))
                 element.remove()
                 return wrapper
             }
 
             // Handle publisher-to-subscriber and subscriber-to-publisher change
             if (
                 !roleInterpreter
                 && (rolePublisher && !isPublisher) || (!rolePublisher && isPublisher)
             ) {
                 element.remove()
                 return participantCreate(params)
             }
         }
 
         let muted = false
         let video = element.find('video')[0]
 
         // When a channel is selected - mute everyone except the interpreter of the language.
         // When a channel is not selected - mute language interpreters only
         if (sessionData.channel) {
             muted = !(roleInterpreter && params.language == sessionData.channel)
         } else {
             muted = roleInterpreter
         }
 
         if (muted && !isSelf) {
             element.find('.status-audio').removeClass('hidden')
             element.find('.link-audio').addClass('hidden')
         } else {
             element.find('.status-audio')[params.audioActive ? 'addClass' : 'removeClass']('hidden')
 
             if (!isSelf) {
                 element.find('.link-audio').removeClass('hidden')
             }
 
             muted = !params.audioActive || isSelf
         }
 
         element.find('.status-video')[params.videoActive ? 'addClass' : 'removeClass']('hidden')
 
         if (video) {
             video.muted = muted
         }
 
         if ('nickname' in params) {
             element.find('.meet-nickname > .content').text(params.nickname)
         }
 
         if (isSelf) {
             element.addClass('self')
         }
 
         if (isModerator) {
             element.addClass('moderated')
         }
 
         const withPerm = isModerator && !roleScreen && !(roleOwner && !isSelf);
         const withMenu = isSelf || (isModerator && !roleOwner)
 
         // TODO: This probably could be better done with css
         let elements = {
             '.dropdown-menu': withMenu,
             '.permissions': withPerm,
             '.interpreting': withPerm && rolePublisher,
             'svg.moderator': roleModerator,
             'svg.user': !roleModerator && !roleInterpreter,
             'svg.interpreter': !roleModerator && roleInterpreter
         }
 
         Object.keys(elements).forEach(key => {
             element.find(key)[elements[key] ? 'removeClass' : 'addClass']('hidden')
         })
 
         element.find('.action-role-publisher input').prop('checked', rolePublisher)
         element.find('.action-role-moderator input').prop('checked', roleModerator)
             .prop('disabled', roleOwner)
 
         element.find('.interpreting select').val(roleInterpreter ? params.language : '')
 
         return wrapper
     }
 
     /**
      * Update/refresh state of all participants' elements
      */
     function participantUpdateAll() {
         Object.keys(peers).forEach(peerId => {
             const peer = peers[peerId]
             participantUpdate(peer.element, peer)
         })
     }
 
     /**
      * Create a tag-like element for a subscriber participant
      *
      * @param params  Connection metadata/params
      * @param content Optional content to prepend to the element
      */
     function subscriberCreate(params, content) {
         // Create the element
         let wrapper = $('<div class="meet-subscriber">').append(nicknameWidget(params))
 
         if (content) {
             wrapper.prepend(content)
         }
 
         participantUpdate(wrapper, params, true)
 
         return wrapper[params.isSelf ? 'prependTo' : 'appendTo'](subscribersContainer)
             .attr('id', 'subscriber-' + params.id)
             .get(0)
     }
 
     /**
      * Create a tag-like nickname widget
      *
      * @param object params Peer metadata/params
      */
     function nicknameWidget(params) {
         let languages = []
 
         // Append languages selection options
         Object.keys(sessionData.languages).forEach(code => {
             languages.push(`<option value="${code}">${$t(sessionData.languages[code])}</option>`)
         })
 
         // Create the element
         let element = $(
             '<div class="dropdown">'
                 + '<a href="#" class="meet-nickname btn" aria-haspopup="true" aria-expanded="false" role="button">'
                     + '<span class="content"></span>'
                     + '<span class="icon">'
                         + svgIcon('user', null, 'user')
                         + svgIcon('crown', null, 'moderator hidden')
                         + svgIcon('headphones', null, 'interpreter hidden')
                     + '</span>'
                 + '</a>'
                 + '<div class="dropdown-menu">'
                     + '<a class="dropdown-item action-nickname" href="#">Nickname</a>'
                     + '<a class="dropdown-item action-dismiss" href="#">Dismiss</a>'
                     + '<div class="dropdown-divider permissions"></div>'
                     + '<div class="permissions">'
                         + '<h6 class="dropdown-header">' + $t('meet.perm') + '</h6>'
                         + '<label class="dropdown-item action-role-publisher form-check form-switch">'
                             + '<input type="checkbox" class="form-check-input">'
                             + ' <span class="form-check-label">' + $t('meet.perm-av') + '</span>'
                         + '</label>'
                         + '<label class="dropdown-item action-role-moderator form-check form-switch">'
                             + '<input type="checkbox" class="form-check-input">'
                             + ' <span class="form-check-label">' + $t('meet.perm-mod') + '</span>'
                         + '</label>'
                     + '</div>'
                     + '<div class="dropdown-divider interpreting"></div>'
                     + '<div class="interpreting">'
                         + '<h6 class="dropdown-header">' + $t('meet.lang-int') + '</h6>'
                         + '<div class="ps-3 pe-3"><select class="form-select">'
                             + '<option value="">- ' + $t('form.none') + ' -</option>'
                             + languages.join('')
                         + '</select></div>'
                     + '</div>'
                 + '</div>'
             + '</div>'
         )
 
         let nickname = element.find('.meet-nickname')
             .addClass('btn btn-outline-' + (params.isSelf ? 'primary' : 'secondary'))
             .attr({title: $t('meet.menu-options'), 'data-bs-toggle': 'dropdown'})
 
         const dropdown = new Dropdown(nickname[0], { boundary: container.parentNode })
 
         if (params.isSelf) {
             // Add events for nickname change
             let editable = element.find('.content')[0]
             let editableEnable = () => {
                 editable.contentEditable = true
                 editable.focus()
             }
             let editableUpdate = () => {
                 // Skip redundant update on blur, if it was already updated
                 if (editable.contentEditable !== 'false') {
                     editable.contentEditable = false
                     client.setNickname(editable.innerText)
                 }
             }
 
             element.find('.action-nickname').on('click', editableEnable)
             element.find('.action-dismiss').remove()
 
             $(editable).on('blur', editableUpdate)
                 .on('keydown', e => {
                     // Enter or Esc
                     if (e.keyCode == 13 || e.keyCode == 27) {
                         editableUpdate()
                         return false
                     }
 
                     // Do not propagate the event, so it does not interfere with our
                     // keyboard shortcuts
                     e.stopPropagation()
                 })
         } else {
             element.find('.action-nickname').remove()
 
             element.find('.action-dismiss').on('click', () => {
                 client.kickPeer(params.id)
             })
         }
 
         // Don't close the menu on permission change
         element.find('.dropdown-menu > label').on('click', e => { e.stopPropagation() })
 
         element.find('.action-role-publisher input').on('change', e => {
             client[e.target.checked ? 'addRole' : 'removeRole'](params.id, Roles.PUBLISHER)
         })
 
         element.find('.action-role-moderator input').on('change', e => {
             client[e.target.checked ? 'addRole' : 'removeRole'](params.id, Roles.MODERATOR)
         })
 
         element.find('.interpreting select')
             .on('change', e => {
                 const language = $(e.target).val()
                 client.setLanguage(params.id, language)
                 dropdown.hide()
             })
             .on('click', e => {
                 // Prevents from closing the dropdown menu on click
                 e.stopPropagation()
             })
 
         return element.get(0)
     }
 
     /**
      * Window onresize event handler (updates room layout)
      */
     function resize() {
         if (publishersContainer) {
             updateLayout()
         }
 
         $(container).parent()[window.screen.width <= 768 ? 'addClass' : 'removeClass']('mobile')
     }
 
     /**
      * Update the room "matrix" layout
      */
     function updateLayout() {
         let publishers = $(publishersContainer).find('.meet-video')
         let numOfVideos = publishers.length
 
         if (sessionData && sessionData.counterElement) {
             sessionData.counterElement.innerHTML = Object.keys(peers).length
         }
 
         if (!numOfVideos) {
             subscribersContainer.style.minHeight = 'auto'
             return
         }
 
         // Note: offsetHeight/offsetWidth return rounded values, but for proper matrix
         // calculations we need more precision, therefore we use getBoundingClientRect()
 
         let allHeight = container.offsetHeight
         let scrollHeight = subscribersContainer.scrollHeight
         let bcr = publishersContainer.getBoundingClientRect()
         let containerWidth = bcr.width
         let containerHeight = bcr.height
         let limit = Math.ceil(allHeight * 0.25) // max subscribers list height
 
         // Fix subscribers list height
         if (subscribersContainer.offsetHeight <= scrollHeight) {
             limit = Math.min(scrollHeight, limit)
             subscribersContainer.style.minHeight = limit + 'px'
             containerHeight = allHeight - limit
         } else {
             subscribersContainer.style.minHeight = 'auto'
         }
 
         let css, rows, cols, height, padding = 0
 
         // Make the first screen sharing tile big
         let screenVideo = publishers.filter('.screen').find('video').get(0)
 
 /*
         if (screenVideo) {
             const element = screenVideo.parentNode
             const peerId = element.id.replace(/^publisher-/, '')
             const peer = peers[peerId]
 
             // We know the shared screen video dimensions, we can calculate
             // width/height of the tile in the matrix
             if (peer && peer.videoDimensions) {
                 let screenWidth = peer.videoDimensions.width
                 let screenHeight = containerHeight
 
                 // TODO: When the shared window is minimized the width/height is set to 1 (or 2)
                 //       - at least on my system. We might need to handle this case nicer. Right now
                 //       it create a 1-2px line on the left of the matrix - not a big issue.
                 // TODO: Make the 0.666 factor bigger for wide screen and small number of participants?
                 let maxWidth = Math.ceil(containerWidth * 0.666)
 
                 if (screenWidth > maxWidth) {
                     screenWidth = maxWidth
                 }
 
                 // Set the tile position and size
                 $(element).css({
                     width: screenWidth + 'px',
                     height: screenHeight + 'px',
                     position: 'absolute',
                     top: 0,
                     left: 0
                 })
 
                 padding = screenWidth + 'px'
 
                 // Now the estate for the rest of participants is what's left on the right side
                 containerWidth -= screenWidth
                 publishers = publishers.not(element)
                 numOfVideos -= 1
             }
         }
 */
         // Compensate the shared screen estate with a padding
         $(publishersContainer).css('padding-left', padding)
 
         const factor = containerWidth / containerHeight
 
         if (factor >= 16/9) {
             if (numOfVideos <= 3) {
                 rows = 1
             } else if (numOfVideos <= 8) {
                 rows = 2
             } else if (numOfVideos <= 15) {
                 rows = 3
             } else if (numOfVideos <= 20) {
                 rows = 4
             } else {
                 rows = 5
             }
 
             cols = Math.ceil(numOfVideos / rows)
         } else {
             if (numOfVideos == 1) {
                 cols = 1
             } else if (numOfVideos <= 4) {
                 cols = 2
             } else if (numOfVideos <= 9) {
                 cols = 3
             } else if (numOfVideos <= 16) {
                 cols = 4
             } else if (numOfVideos <= 25) {
                 cols = 5
             } else {
                 cols = 6
             }
 
             rows = Math.ceil(numOfVideos / cols)
 
             if (rows < cols && containerWidth < containerHeight) {
                 cols = rows
                 rows = Math.ceil(numOfVideos / cols)
             }
         }
 
         // console.log('factor=' + factor, 'num=' + numOfVideos, 'cols = '+cols, 'rows=' + rows);
 
         // Update all tiles (except the main shared screen) in the matrix
         publishers.css({
             width: (containerWidth / cols) + 'px',
             // Height must be in pixels to make object-fit:cover working
             height:  (containerHeight / rows) + 'px'
         })
     }
 
     /**
      * Create an svg element (string) for a FontAwesome icon
      *
      * @todo Find if there's a "official" way to do this
      */
     function svgIcon(name, type, className) {
         // Note: the library will contain definitions for all icons registered elswhere
         const icon = library.definitions[type || 'fas'][name]
 
         let attrs = {
             'class': 'svg-inline--fa',
             'aria-hidden': true,
             focusable: false,
             role: 'img',
             xmlns: 'http://www.w3.org/2000/svg',
             viewBox: `0 0 ${icon[0]} ${icon[1]}`
         }
 
         if (className) {
             attrs['class'] += ' ' + className
         }
 
         return $(`<svg><path fill="currentColor" d="${icon[4]}"></path></svg>`)
             .attr(attrs)
             .get(0).outerHTML
     }
 
     /**
      * Update the session state
      *
      * @param force Force UI refresh
      */
     function updateSession(force) {
         // Update channels list
         sessionData.channels = getChannels(peers)
 
         // The channel user was using has been removed (or the participant stopped being an interpreter)
         if (sessionData.channel && !sessionData.channels.includes(sessionData.channel)) {
             sessionData.channel = null
             force = true
         }
 
         // Mute/unmute all peers depending on the selected channel
         // Also updates participant menu according to the current user role
         if (force) {
             participantUpdateAll()
         }
 
+        // Update peer properties
+        let peer = peers[selfId]
+
+        sessionData.audioActive = peer.audioActive
+        sessionData.videoActive = peer.videoActive
+        sessionData.audioSource = peer.audioSource
+        sessionData.videoSource = peer.videoSource
+        sessionData.screenActive = peer.screenActive
+
         // Inform the vue component, so it can update some UI controls
         sessionData.onUpdate(sessionData)
     }
 
     /**
      * Get all existing language interpretation channels
      */
     function getChannels(peers) {
         let channels = []
 
         Object.values(peers).forEach(peer => {
             if (peer.language && !channels.includes(peer.language)) {
                 channels.push(peer.language)
             }
         })
 
         return channels
     }
 }
 
 export { Room }