diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 44ce0c051db3236026fbfe037bd9f2657b141e60..62947ff098ffb5caca3fd8b7e8ba90beb9a7b2d9 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -518,7 +518,8 @@ bbb.highlighter.toolbar.color = Select Color
 bbb.highlighter.toolbar.color.accessibilityName = Whiteboard mark draw color
 bbb.highlighter.toolbar.thickness = Change Thickness
 bbb.highlighter.toolbar.thickness.accessibilityName = Whiteboard draw thickness
-bbb.highlighter.toolbar.multiuser = Multi-user Drawing
+bbb.highlighter.toolbar.multiuser.start = Start multi-user whiteboard
+bbb.highlighter.toolbar.multiuser.stop = Stop multi-user whiteboard
 bbb.logout.button.label = OK
 bbb.logout.appshutdown = The server app has been shut down
 bbb.logout.asyncerror = An Async Error occured
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 f5ee3ac032c7fefc03e28535af3f8d7961a5241d..218c1373f911120ef232f304a867cb44466c25c9 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
@@ -350,5 +350,5 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			   width="{BUTTON_SIZE}" height="{BUTTON_SIZE}"
 			   selected="{multiUser}"
 			   styleName="{multiUser ? 'multiUserWhiteboardOnButtonStyle' : 'multiUserWhiteboardOffButtonStyle'}"
-			   toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.multiuser')}" /> 
+			   toolTip="{!multiUser ? ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.multiuser.start') : ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.multiuser.stop')}" />
 </mx:VBox>