diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 395b6ba464..1690e51772 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -63,8 +63,8 @@ bbb.mainToolbar.logoutBtn.toolTip = Log out
 bbb.mainToolbar.langSelector = Select language
 bbb.mainToolbar.settingsBtn = Settings
 bbb.mainToolbar.settingsBtn.toolTip = Open Settings
-bbb.mainToolbar.shortcutBtn = Shortcut Help
-bbb.mainToolbar.shortcutBtn.toolTip = Open Shortcut Help window
+bbb.mainToolbar.shortcutBtn = Shortcut Keys
+bbb.mainToolbar.shortcutBtn.toolTip = Open Shortcut Keys window
 bbb.mainToolbar.recordBtn.toolTip.start = Start recording
 bbb.mainToolbar.recordBtn.toolTip.stop = Stop recording
 bbb.mainToolbar.recordBtn.toolTip.recording = The session is being recorded
@@ -336,7 +336,7 @@ bbb.accessibility.chat.initialDescription = Please use the arrow keys to navigat
 
 bbb.accessibility.notes.notesview.input = Notes input
 
-bbb.shortcuthelp.title = Shortcut Help
+bbb.shortcuthelp.title = Shortcut Keys
 bbb.shortcuthelp.minimizeBtn.accessibilityName = Minimize the Shortcut Help Window
 bbb.shortcuthelp.maximizeRestoreBtn.accessibilityName = Maximize the Shortcut Help Window
 bbb.shortcuthelp.closeBtn.accessibilityName = Close the Shortcut Help Window
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
old mode 100644
new mode 100755
index f9ecd43732..3b427bdcb3
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
@@ -113,7 +113,6 @@
 				
 				settingsBtn.visible = settingsBtn.includeInLayout = partOptions.enableSettingsButton && amIModerator;
 				
-				BindingUtils.bindSetter(changeButtons, UserManager.getInstance().getConference(), "amIPresenter");
 				BindingUtils.bindSetter(updateNumberofUsers, users, "length");
 				
 				this.addEventListener(KeyboardEvent.KEY_DOWN, handleKeyDown);
@@ -122,8 +121,6 @@
 				modifier = ExternalInterface.call("determineModifier");
 				loadKeyCombos(modifier);
 				
-				changeButtons(UserManager.getInstance().getConference().amIPresenter);
-				
 				resourcesChanged();
 				
 				roomMuted = MeetingModel.getInstance().meetingMuted;
@@ -155,7 +152,7 @@
 			}
 			
 			private function changeButtons(presenter:Boolean):void {
-				raiseHandBtn.visible = raiseHandBtn.includeInLayout = partOptions.enableRaiseHand && !(presenter || amIModerator);
+				raiseHandBtn.visible = raiseHandBtn.includeInLayout = partOptions.enableRaiseHand;
 			}
 			
 			private function onItemRollOver(event:ListEvent):void{
@@ -455,7 +452,7 @@
 					toolTip="{ResourceUtil.getInstance().getString('bbb.users.settings.buttonTooltip')}" click="openSettings()" visible="true" tabIndex="{partOptions.baseTabIndex+10}" />
 		<mx:Button id="raiseHandBtn" toggle="true" icon="{images.hand_new}" selected="{UserManager.getInstance().getConference().isMyHandRaised}"
 					width="30" height="30" toolTip="{ResourceUtil.getInstance().getString('bbb.users.raiseHandBtn.toolTip')}" click="raiseHand()"
-					visible="false" tabIndex="{partOptions.baseTabIndex+15}" />
+					visible="true" tabIndex="{partOptions.baseTabIndex+15}" />
 		<mx:VBox>
 			<mx:Label text="{ResourceUtil.getInstance().getString('bbb.users.roomMuted.text')}" visible="{roomMuted}" includeInLayout="{roomMuted}" />
 			<mx:Label text="{ResourceUtil.getInstance().getString('bbb.users.roomLocked.text')}" visible="{roomLocked}" includeInLayout="{roomLocked}" />