diff --git a/bigbluebutton-html5/imports/api/screenshare/client/bridge/kurento.js b/bigbluebutton-html5/imports/api/screenshare/client/bridge/kurento.js
index 77e10ef49f17aa622bb35ba843f86e073fd885d6..a939e1a6887657e81b34d7d293f2913634fbf779 100755
--- a/bigbluebutton-html5/imports/api/screenshare/client/bridge/kurento.js
+++ b/bigbluebutton-html5/imports/api/screenshare/client/bridge/kurento.js
@@ -2,21 +2,16 @@ import Users from '/imports/api/users';
 import Auth from '/imports/ui/services/auth';
 import BridgeService from './service';
 
-const CHROME_EXTENSION_KEY = Meteor.settings.public.kurento.chromeExtensionKey;
+const CHROME_DEFAULT_EXTENSION_KEY = Meteor.settings.public.kurento.chromeDefaultExtensionKey;
+const CHROME_CUSTOM_EXTENSION_KEY = Meteor.settings.public.kurento.chromeExtensionKey;
 
-const getUserId = () => {
-  const userID = Auth.userID;
-  return userID;
-}
+const CHROME_EXTENSION_KEY = CHROME_CUSTOM_EXTENSION_KEY === 'KEY' ? CHROME_DEFAULT_EXTENSION_KEY : CHROME_CUSTOM_EXTENSION_KEY;
 
-const getMeetingId = () => {
-  const meetingID = Auth.meetingID;
-  return meetingID;
-}
+const getUserId = () => Auth.userID;
 
-const getUsername = () => {
-  return Users.findOne({ userId: getUserId() }).name;
-}
+const getMeetingId = () => Auth.meetingID;
+
+const getUsername = () => Users.findOne({ userId: getUserId() }).name;
 
 export default class KurentoScreenshareBridge {
   kurentoWatchVideo() {
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-dock/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-dock/component.jsx
index ec1d973584da87347313fb331a86fb5b60621f21..9ea0179355640deadac4db34e53f467e0d60e6a3 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-dock/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-dock/component.jsx
@@ -1,12 +1,6 @@
 import React, { Component } from 'react';
-import { styles } from '../styles';
 import { defineMessages, injectIntl } from 'react-intl';
-import { log } from '/imports/ui/services/api';
 import { notify } from '/imports/ui/services/notification';
-import { toast } from 'react-toastify';
-import { styles as mediaStyles } from '/imports/ui/components/media/styles';
-import Toast from '/imports/ui/components/toast/component';
-import _ from 'lodash';
 
 import VideoList from '../video-list/component';
 
@@ -29,8 +23,6 @@ class VideoDock extends Component {
   }
 
   componentDidMount() {
-    const { users, userId } = this.props;
-
     document.addEventListener('installChromeExtension', this.installChromeExtension.bind(this));
   }
 
@@ -45,7 +37,11 @@ class VideoDock extends Component {
   installChromeExtension() {
     console.log(intlMessages);
     const { intl } = this.props;
-    const CHROME_EXTENSION_LINK = Meteor.settings.public.kurento.chromeExtensionLink;
+
+    const CHROME_DEFAULT_EXTENSION_LINK = Meteor.settings.public.kurento.chromeDefaultExtensionLink;
+    const CHROME_CUSTOM_EXTENSION_LINK = Meteor.settings.public.kurento.chromeExtensionLink;
+
+    const CHROME_EXTENSION_LINK = CHROME_CUSTOM_EXTENSION_LINK === 'LINK' ? CHROME_DEFAULT_EXTENSION_LINK : CHROME_CUSTOM_EXTENSION_LINK;
 
     this.notifyError(<div>
       {intl.formatMessage(intlMessages.chromeExtensionError)}{' '}
@@ -56,16 +52,23 @@ class VideoDock extends Component {
   }
 
   render() {
-    if (!this.props.socketOpen) {
+    const {
+      socketOpen,
+      users,
+      onStart,
+      onStop,
+    } = this.props;
+
+    if (!socketOpen) {
       // TODO: return something when disconnected
       return null;
     }
 
     return (
       <VideoList
-        users={this.props.users}
-        onMount={this.props.onStart}
-        onUnmount={this.props.onStop}
+        users={users}
+        onMount={onStart}
+        onUnmount={onStop}
       />
     );
   }
diff --git a/bigbluebutton-html5/private/config/settings-development.json b/bigbluebutton-html5/private/config/settings-development.json
index c168749066a125b6bc1e500fc6d7e9cc4df4b03e..4e130b8d341d407c76a9f8fa3c5c351eabb8f066 100755
--- a/bigbluebutton-html5/private/config/settings-development.json
+++ b/bigbluebutton-html5/private/config/settings-development.json
@@ -58,8 +58,10 @@
 
     "kurento": {
       "wsUrl": "HOST",
-      "chromeExtensionKey": "akgoaoikmbmhcopjgakkcepdgdgkjfbc",
-      "chromeExtensionLink": "https://chrome.google.com/webstore/detail/bigbluebutton-screenshare/akgoaoikmbmhcopjgakkcepdgdgkjfbc",
+      "chromeDefaultExtensionKey": "akgoaoikmbmhcopjgakkcepdgdgkjfbc",
+      "chromeDefaultExtensionLink": "https://chrome.google.com/webstore/detail/bigbluebutton-screenshare/akgoaoikmbmhcopjgakkcepdgdgkjfbc",
+      "chromeExtensionLink": "LINK",
+      "chromeExtensionKey": "KEY",
       "enableScreensharing": false,
       "enableVideo": false
     },
diff --git a/bigbluebutton-html5/private/config/settings-production.json b/bigbluebutton-html5/private/config/settings-production.json
index 78f38c0af91146c61fa226c3aa821f7123bc9a50..49714b3e0056f7bd6b88232ee0d56f649c8bd8f4 100755
--- a/bigbluebutton-html5/private/config/settings-production.json
+++ b/bigbluebutton-html5/private/config/settings-production.json
@@ -58,8 +58,10 @@
 
     "kurento": {
       "wsUrl": "HOST",
-      "chromeExtensionKey": "akgoaoikmbmhcopjgakkcepdgdgkjfbc",
-      "chromeExtensionLink": "https://chrome.google.com/webstore/detail/bigbluebutton-screenshare/akgoaoikmbmhcopjgakkcepdgdgkjfbc",
+      "chromeDefaultExtensionKey": "akgoaoikmbmhcopjgakkcepdgdgkjfbc",
+      "chromeDefaultExtensionLink": "https://chrome.google.com/webstore/detail/bigbluebutton-screenshare/akgoaoikmbmhcopjgakkcepdgdgkjfbc",
+      "chromeExtensionLink": "LINK",
+      "chromeExtensionKey": "KEY",
       "enableScreensharing": false,
       "enableVideo": false
     },