diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as b/bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
index 1f3860dbc5f153faee55ac0c10be76090b79d3b6..19b21037dd7bf9e38aea273845cdc90d10148b1d 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
@@ -23,6 +23,7 @@ package org.bigbluebutton.main.events
 
 	public class BBBEvent extends Event
 	{
+		public static const END_MEETING_EVENT:String = 'END_MEETING_EVENT';
 		public static const LOGIN_EVENT:String = 'loginEvent';
 		public static const RECEIVED_PUBLIC_CHAT_MESSAGE_EVENT:String = 'RECEIVED_PUBLIC_CHAT_MESSAGE_EVENT';
 		public static const SEND_PUBLIC_CHAT_MESSAGE_EVENT:String = 'SEND_PUBLIC_CHAT_MESSAGE_EVENT';
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
index 2238661bc04f21683e27fb6b721298c3ca1618fa..2755d1a2d651ee7582ac6b501e06dd8c4d6f0e8d 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
@@ -27,8 +27,6 @@ package org.bigbluebutton.main.model.users
 	import flash.net.Responder;
 	import flash.net.SharedObject;
 	
-	import mx.controls.Alert;
-	
 	import org.bigbluebutton.common.LogUtil;
 	import org.bigbluebutton.main.events.BBBEvent;
 	import org.bigbluebutton.main.events.LogoutEvent;
@@ -36,8 +34,7 @@ package org.bigbluebutton.main.model.users
 	import org.bigbluebutton.main.events.PresenterStatusEvent;
 	import org.bigbluebutton.main.model.ConferenceParameters;
 	import org.bigbluebutton.main.model.User;
-	import org.bigbluebutton.main.model.users.events.ConnectionFailedEvent;
-	import org.bigbluebutton.main.model.users.events.RoleChangeEvent;
+	import org.bigbluebutton.main.model.users.events.ConnectionFailedEvent;
 
 	public class UsersSOService
 	{
@@ -172,9 +169,12 @@ package org.bigbluebutton.main.model.users
 			dispatcher.dispatchEvent(joinEvent);				
 		}
 		
+		/**
+		 * Called by the server to tell the client that the meeting has ended.
+		 */
 		public function logout():void {
 			var dispatcher:Dispatcher = new Dispatcher();
-			var endMeetingEvent:BBBEvent = new BBBEvent("EndMeetingKickAllEvent");
+			var endMeetingEvent:BBBEvent = new BBBEvent(BBBEvent.END_MEETING_EVENT);
 			dispatcher.dispatchEvent(endMeetingEvent);
 		}
 		
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
index 3cd59fb04b1f70532530d47186c7c2ebec9634fb..d257139f8d0aa5e1bf75ab7cf9c3082246b26517 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
@@ -26,13 +26,14 @@
 	
 	<mate:Listener type="{ToolbarButtonEvent.ADD}" method="handleAddToolbarButtonEvent" />	
 	<mate:Listener type="{ToolbarButtonEvent.REMOVE}" method="handleRemoveToolbarButtonEvent"/>
-	<mate:Listener type="EndMeetingKickAllEvent" method="handleEndMeetingEvent"/>
+	<mate:Listener type="{BBBEvent.END_MEETING_EVENT}" method="handleEndMeetingEvent"/>
 	<mate:Listener type="{ConnectionFailedEvent.USER_LOGGED_OUT}" method="hideToolbar" />
 	<mate:Listener type="{SuccessfulLoginEvent.USER_LOGGED_IN}" method="loginSuccess" />
 	<mate:Listener type="{ConfigEvent.CONFIG_EVENT}" method="gotConfigParameters" />
 	
 	<mx:Script>
 		<![CDATA[
+			import org.bigbluebutton.common.LogUtil;
 			import com.asfusion.mate.events.Dispatcher;
 			
 			import mx.controls.Alert;
@@ -68,6 +69,7 @@
 			}
 			
 			private function handleEndMeetingEvent(event:BBBEvent):void {
+				LogUtil.debug("Received end meeting event.");
 				doLogout();
 			}
 			
@@ -111,6 +113,4 @@
 	<mx:LinkButton label="{ResourceUtil.getInstance().getString('bbb.mainToolbar.helpBtn')}" click="onHelpButtonClicked()"/>
 	<mx:Button label="{ResourceUtil.getInstance().getString('bbb.mainToolbar.logoutBtn')}" id="btnLogout" 
 			   toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.logoutBtn.toolTip')}" right="10" click="doLogout()"/>
-	<!--<mx:Button id="disconnectTest" label="Disconnect Test" click="onDisconnectTest()" />-->
-	
 </mx:ApplicationControlBar>