diff --git a/bigbluebutton-client/.gitignore b/bigbluebutton-client/.gitignore
old mode 100644
new mode 100755
index 03136ca017a9070979d4ef0cc8c2112a499e7d1e..6ca8f89113aa0c273fb2ccdaacd0a287cd314667
--- a/bigbluebutton-client/.gitignore
+++ b/bigbluebutton-client/.gitignore
@@ -1,5 +1,3 @@
-.actionScriptProperties
-.flexProperties
 linker-report.xml
 bin
 client
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
index d2a93531a47177082cf2b00fe11b5cae66d2f975..787e1d5473b96e0152e78e667ebfefc2bebfca4f 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
@@ -32,6 +32,10 @@ package org.bigbluebutton.main.model.users
 	
 	public class BBBUser
 	{
+		public static const MODERATOR:String = "MODERATOR";
+		public static const VIEWER:String = "VIEWER";
+		public static const PRESENTER:String = "PRESENTER";
+		
 		[Bindable] public var me:Boolean = false;
 		[Bindable] public var userid:Number;
 		[Bindable] public var name:String;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/breakout/business/BreakoutProxy.as b/bigbluebutton-client/src/org/bigbluebutton/modules/breakout/business/BreakoutProxy.as
index 54045e8fa345b9fbfbb93130f5724eceab4106a7..278ffdcef8f353371e0fae14b4e7b1fd3db186a8 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/breakout/business/BreakoutProxy.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/breakout/business/BreakoutProxy.as
@@ -14,6 +14,10 @@ package org.bigbluebutton.modules.breakout.business
 	
 	import mx.controls.Alert;
 	import mx.events.CloseEvent;
+	
+	import org.bigbluebutton.main.api.UserManager;
+	import org.bigbluebutton.main.model.users.BBBUser;
+	import org.bigbluebutton.main.model.users.Conference;
 
 	public class BreakoutProxy
 	{		
@@ -106,6 +110,7 @@ package org.bigbluebutton.modules.breakout.business
 		}
 		
 		private function startRoom():void{
+			if (! newRoomHasModerator(usersList)) attendeePW = moderatorPW; //If there is no moderator assigned in the new room, assign everyone as Moderator;
 			breakoutSO.send("redirectUser", meetingName, moderatorPW, attendeePW, kickUsers, usersList);
 		}
 		
@@ -150,5 +155,14 @@ package org.bigbluebutton.modules.breakout.business
 			}
 			return false;
 		}
+		
+		private function newRoomHasModerator(list:Array):Boolean{
+			var conference:Conference = UserManager.getInstance().getConference();
+			for (var i:int = 0; i<list.length; i++){
+				var user:BBBUser = conference.getParticipant(Number(list[i]));
+				if (user.role == BBBUser.MODERATOR) return true;
+			}
+			return false;
+		}
 	}
 }
\ No newline at end of file