diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorAudit.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorAudit.scala
index 6cc11fc4a5b9ca28aa15eb2621ff48ba2f96d867..2412df8f95be81dbee65b82c157c01ce3d4c9d0b 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorAudit.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorAudit.scala
@@ -73,13 +73,11 @@ class MeetingActorAudit(
     // Trigger updating users of time remaining on meeting.
     eventBus.publish(BigBlueButtonEvent(props.meetingProp.intId, SendTimeRemainingAuditInternalMsg(props.meetingProp.intId)))
 
-    if (props.meetingProp.isBreakout) {
-      // This is a breakout room. Update the main meeting with list of users in this breakout room.
-      eventBus.publish(BigBlueButtonEvent(
+    // This is a breakout room. Update the main meeting with list of users in this breakout room.
+    eventBus.publish(BigBlueButtonEvent(
         props.meetingProp.intId,
         SendBreakoutUsersAuditInternalMsg(props.breakoutProps.parentId, props.meetingProp.intId)
       ))
-    }
   }
 
 }
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
index c79b00bd666c9dcf2949b925c6dbcd19d1b3e542..33879883f832e262dbaf6640270079fca9445f00 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
@@ -155,8 +155,8 @@ package org.bigbluebutton.modules.users.services
 		case "UpdateBreakoutUsersEvtMsg":
 		  handleUpdateBreakoutUsers(message);
 		  break;
-		case "TimeRemainingUpdateEvtMsg":
-	      handleTimeRemainingUpdate(message);
+		case "MeetingTimeRemainingUpdateEvtMsg":
+	      handleMeetingTimeRemainingUpdateEvtMsg(message);
 		  break;
 		case "BreakoutRoomsTimeRemainingUpdateEvtMsg":
 		  handleBreakoutRoomsTimeRemainingUpdate(message);
@@ -719,7 +719,7 @@ package org.bigbluebutton.modules.users.services
 //		UserManager.getInstance().getConference().updateBreakoutRoomUsers(msg.body.breakoutMeetingId, msg.body.users);
 	}
 
-	private function handleTimeRemainingUpdate(msg:Object):void {
+	private function handleMeetingTimeRemainingUpdateEvtMsg(msg:Object):void {
 		var map:Object = JSON.parse(msg.body);
 		var e:BreakoutRoomEvent = new BreakoutRoomEvent(BreakoutRoomEvent.UPDATE_REMAINING_TIME_BREAKOUT);
 		e.durationInMinutes = map.timeRemaining;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
index b5bdc408729f2622b258848f4c3240926a976f59..c920ba82df6b6ac015b1ebae0d597477fa4f9766 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
@@ -131,8 +131,9 @@ package org.bigbluebutton.modules.users.services
 		
 		public function listenInOnBreakout(fomMeetingId:String, toMeetingId:String, userId:String):void {
       var message:Object = {
-        header: {name: "TransferUserToMeetingRequestMsg", meetingId: UsersUtil.getInternalMeetingID(), userId: UsersUtil.getMyUserID()},
-        body: {meetingId: fomMeetingId, targetMeetingId: toMeetingId}
+        header: {name: "TransferUserToMeetingRequestMsg", meetingId: UsersUtil.getInternalMeetingID(), 
+          userId: UsersUtil.getMyUserID()},
+        body: {meetingId: fomMeetingId, targetMeetingId: toMeetingId, userId: UsersUtil.getMyUserID()}
       };
 			
 			var _nc:ConnectionManager = BBB.initConnectionManager();