diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/managers/BroadcastManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/managers/BroadcastManager.as
index e8e4a60df1d5e179c6bfd87c4b6e59cea3fd7c48..dc160746ef65f5d08831b3a38def6acf118dbfbf 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/managers/BroadcastManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/managers/BroadcastManager.as
@@ -83,7 +83,7 @@ package org.bigbluebutton.modules.broadcast.managers
         trace("***BroadcastManager Not Opening BroadcastModule Window");
       }
       
- //     sendWhatIsTheCurrentStreamRequest();
+      sendWhatIsTheCurrentStreamRequest();
       
       if (UserManager.getInstance().getConference().amIPresenter) {
         handleSwitchToPresenterMode();
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/services/BroadcastService.as b/bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/services/BroadcastService.as
index ce0839c3f138aa1154efbec0e1e5f8a53da92553..f214d55937b2fa72ef30396e20149fdaddeea731 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/services/BroadcastService.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/services/BroadcastService.as
@@ -38,35 +38,19 @@ package org.bigbluebutton.modules.broadcast.services
       if (sender == null) {
         trace("SENDER is NULL!!!!");
       }
-//      sender.playStream(uri, streamID, streamName);
-      
-      var event:BBBEvent = new BBBEvent("BroadcastPlayStreamCommand");
-      event.payload["messageID"] = "BroadcastPlayStreamCommand";
-      event.payload["uri"] = uri;
-      event.payload["streamID"] = streamID;
-      event.payload["streamName"] = streamName;		
-      
-      var dispatcher:Dispatcher = new Dispatcher();
-      dispatcher.dispatchEvent(event);
-      
+      sender.playStream(uri, streamID, streamName);
 		}
 		
 		public function stopStream():void {
       trace("BroadcastService::stopStream"); 
-//			sender.stopStream();
-      
-      var event:BBBEvent = new BBBEvent("BroadcastStopStreamCommand");
-      event.payload["messageID"] = "BroadcastStopStreamCommand";    
-      
-      var dispatcher:Dispatcher = new Dispatcher();
-      dispatcher.dispatchEvent(event);     
+			sender.stopStream();
 		}
 		
 		public function sendWhatIsTheCurrentStreamRequest():void {
 			sender.sendWhatIsTheCurrentStreamRequest();
 		}
 		
-		public function sendWhatIsTheCurrentStreamReply(requestedByUserID:Number, streamID:String):void {
+		public function sendWhatIsTheCurrentStreamReply(requestedByUserID:String, streamID:String):void {
 			sender.sendWhatIsTheCurrentStreamReply(requestedByUserID, streamID);
 		}
 	}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/services/MessageSender.as b/bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/services/MessageSender.as
index 603fa8fa4f6a79aeec737d8388932cb0ca3b61c3..98043d6fd2aa133fefb15b5732bd786634ff5195 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/services/MessageSender.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/services/MessageSender.as
@@ -76,7 +76,7 @@ package org.bigbluebutton.modules.broadcast.services
       );
     }
     
-    public function sendWhatIsTheCurrentStreamReply(requestedByUserID:Number, streamID:String):void {
+    public function sendWhatIsTheCurrentStreamReply(requestedByUserID:String, streamID:String):void {
       var message:Object = new Object();
       message["messageID"] = "BroadcastWhatIsTheCurrentStreamReply";	
       message["requestedBy"] = requestedByUserID;