diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/model/UsersOptions.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/model/UsersOptions.as
index a9a43d441c11d42e513c6026ba355fd13e45af85..745ea1b0591589dbabdd6385690b3e3177469a75 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/model/UsersOptions.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/model/UsersOptions.as
@@ -31,8 +31,10 @@ package org.bigbluebutton.modules.users.model
 		[Bindable]
 		public var baseTabIndex:int = 201;
 		
-		public function UsersOptions()
-		{
+		[Bindable]
+		public var allowKickUser:Boolean = false;
+		
+		public function UsersOptions() {
 			var vxml:XML = BBB.getConfigForModule("UsersModule");
 			if (vxml != null) {
 				windowVisible = (vxml.@windowVisible.toString().toUpperCase() == "TRUE") ? true : false;
@@ -43,6 +45,9 @@ package org.bigbluebutton.modules.users.model
 			if (vxml.@baseTabIndex != undefined) {
 				baseTabIndex = vxml.@baseTabIndex;
 			}
+			if (vxml.@allowKickUser != undefined) {
+				allowKickUser = vxml.@allowKickUser;
+			}
 		}
 
 	}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
index 9cb50dffe108c68003905c9040c320adea3b04e5..27ee5a1d14b248f71d235b2cff0a34e10fa5527f 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
@@ -51,6 +51,7 @@
 			import org.bigbluebutton.main.model.users.events.LowerHandEvent;
 			import org.bigbluebutton.modules.users.events.UsersRollEvent;
 			import org.bigbluebutton.modules.users.events.ViewCameraEvent;
+			import org.bigbluebutton.modules.users.model.UsersOptions;
 			import org.bigbluebutton.util.i18n.ResourceUtil;
 			
 			[Bindable]
@@ -66,6 +67,8 @@
 			private var muteRolled:Boolean = false;
 			private var lockRolled:Boolean = false;
 			
+			private var options:UsersOptions;
+			
 			private function onCreationComplete():void{
 				lockBtn.enabled = muteBtn.enabled = kickUserBtn.enabled = moderator = UserManager.getInstance().getConference().amIModerator();
 				
@@ -74,6 +77,10 @@
 				BindingUtils.bindSetter(updateButtons, voiceJoinedInd, "visible");
 				BindingUtils.bindSetter(updateButtons, muteInd, "visible");
 				BindingUtils.bindSetter(updateButtons, voiceLockedInd, "visible");
+				
+				options = new UsersOptions();
+				
+				LogUtil.debug("CHAD: " + options.allowKickUser);
 			}
 			
 			private function dataChangeHandler(e:Event):void {
@@ -148,7 +155,7 @@
 			
 			private function updateButtons(voiceMuted:Boolean = false):void {
 				if (data != null) {
-					kickUserBtn.visible = !data.me && rolledOver;
+					kickUserBtn.visible = !data.me && rolledOver && options.allowKickUser;
 					
 					
 					if (!data.voiceJoined) {
@@ -159,15 +166,14 @@
 					} else {
 						muteImg.visible = !rolledOver;
 						muteImg.includeInLayout = !rolledOver;
+						muteBtn.visible = rolledOver;
+						muteBtn.includeInLayout = rolledOver;
 						
 						if(data.talking && !rolledOver){
 							muteImg.filters = [new GlowFilter(0x898989)];
 						}else{
 							muteImg.filters = [];
 						}
-						
-						muteBtn.visible = rolledOver;
-						muteBtn.includeInLayout = rolledOver;
 					}
 					
 					if ((data.role == Role.MODERATOR) || !data.voiceJoined) {
@@ -192,6 +198,8 @@
 							lockImg.source = images.locked_20;
 						else if (moderator)
 							lockImg.source = images.unlocked_20;
+						else
+							lockImg.source = null;
 					} else {
 						if (data.voiceMuted == rolledOverMute)
 							muteBtn.setStyle("icon", images.audio);
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
index da8f55b516374a2e0a2d625acb0d7825dde76016..59e096d792eac6a7a1dc5c64dbbea5d05bfc116b 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
@@ -338,7 +338,7 @@
 			}
 			
 			public function remoteKickUser():void{
-				if (amIModerator && usersGrid.selectedIndex != -1) {
+				if (amIModerator && usersGrid.selectedIndex != -1 && partOptions.allowKickUser) {
 					var selData:Object = usersGrid.selectedItem;
 					
 					if (!selData.me)
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
index 507eade9164d6e4ae4414395bd724391184e3f92..0fdec10e33120a1a99cfb864c0e38cc86d4ef1ca 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
@@ -109,7 +109,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			[Bindable] public var wbOptions:WhiteboardOptions;
 			[Bindable] private var baseIndex:int;
 			
-			[Bindable] private var showWhiteboardToolbar:Boolean = true;
+			[Bindable] private var showWhiteboardToolbar:Boolean = false;
 
 			public var canvas:WhiteboardCanvas;
 			private var presentationWindow:PresentationWindow;