diff --git a/app.js b/app.js
index ddf403bbf..16619533b 100644
--- a/app.js
+++ b/app.js
@@ -60,6 +60,7 @@ var getVideoPosition;
 var sessionTerminated = false;
 
 function init() {
+    Toolbar.setupButtonsFromConfig();
     RTC = setupRTC();
     if (RTC === null) {
         window.location.href = 'webrtcrequired.html';
diff --git a/index.html b/index.html
index 35f6dd30b..4afd54c14 100644
--- a/index.html
+++ b/index.html
@@ -190,10 +190,12 @@
                         </a>
                         <span id="unreadMessages"></span>
                     </span>
-                    <div class="header_button_separator"></div>
-                    <a class="button" data-toggle="popover" data-placement="bottom" content="Share Prezi" onclick='Prezi.openPreziDialog();'>
-                        <i class="icon-prezi"></i>
-                    </a>
+                    <span id="prezi_button">
+                        <div class="header_button_separator"></div>
+                        <a class="button" data-toggle="popover" data-placement="bottom" content="Share Prezi" onclick='Prezi.openPreziDialog();'>
+                            <i class="icon-prezi"></i>
+                        </a>
+                    </span>
                     <span id="etherpadButton">
                         <div class="header_button_separator"></div>
                         <a class="button" data-toggle="popover" data-placement="bottom" content="Shared document" onclick='Etherpad.toggleEtherpad(0);'>
diff --git a/toolbar.js b/toolbar.js
index ae0ff18ea..b79edbcbb 100644
--- a/toolbar.js
+++ b/toolbar.js
@@ -1,5 +1,15 @@
 var Toolbar = (function (my) {
 
+    /**
+     * Disables and enables some of the buttons.
+     */
+    my.setupButtonsFromConfig = function () {
+        if(config.disablePrezi)
+        {
+            $("#prezi_button").css({display: "none"});
+        }
+    }
+
     /**
      * Opens the lock room dialog.
      */