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 b9dcf0d7e329454a3471ce9925c9be5af40cf556..a30af79cbd239e619b3829f1c682b086b418163a 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
@@ -548,7 +548,7 @@ package org.bigbluebutton.modules.users.services
       UserManager.getInstance().getConference().addUser(user);
       
       if (joinedUser.hasStream) {
-        var streams:Array = joinedUser.webcamStream.split("|");
+        var streams:Array = joinedUser.webcamStream;
         for each(var stream:String in streams) {
           UserManager.getInstance().getConference().sharedWebcam(user.userID, stream);
         }
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
index bff8e9a31c3c49bbdc9854fd0e05960acd46c41e..5aae027995abc93c4337e867f2aac033d9d5bdcd 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
@@ -464,6 +464,7 @@ package org.bigbluebutton.modules.videoconf.maps
 		  stopAllBroadcasting();
 		  trace("VideoEventMapDelegate:: Closing all webcam windows.");
 		  closeAllWindows()
+		  openWebcamWindows();
 	  } else {
 		  addToolbarButton();
 		  openWebcamWindows();		  
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserVideo.as b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserVideo.as
old mode 100644
new mode 100755
index 4e767190e9dcce9e4dfa19873a215d779a49fa03..0bbba75b929b9d9e83731d75ba3e2ada24c6c997
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserVideo.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserVideo.as
@@ -66,7 +66,7 @@ package org.bigbluebutton.modules.videoconf.views
 
     protected function getVideoProfile(stream:String):VideoProfile {
       trace("Parsing stream name [" + stream + "]");
-      var pattern:RegExp = new RegExp("([A-Za-z0-9]+)-([A-Za-z0-9]+)-\\d+", "");
+      var pattern:RegExp = new RegExp("([A-Za-z0-9_]+)-([A-Za-z0-9]+)-\\d+", "");
       if (pattern.test(stream)) {
         trace("The stream name is well formatted");
         trace("Video profile resolution is [" + pattern.exec(stream)[1] + "]");