Fixed setting of default room from user settings by loading them first.

static/js/controllers/mediastreamcontroller.js

@@ -455,11 +455,6 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'webrtc.adapte
 			// Propagate authentication event.
 			appData.e.triggerHandler("selfReceived", [data]);
 
-			if (!$rootScope.roomid && $scope.user.settings.defaultRoom) {
-				console.log("Selecting user based default room:", [$scope.user.settings.defaultRoom]);
-				mediaStream.changeRoom($scope.user.settings.defaultRoom, true);
-			}
-
 			// Unmark authorization process.
 			if (data.Userid) {
 				mediaStream.users.authorizing(false);
@@ -468,6 +463,11 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'webrtc.adapte
 				$scope.loadUserSettings();
 			}
 
+			if (!$rootScope.roomid && $scope.master.settings.defaultRoom) {
+				console.log("Selecting default room from settings:", [$scope.master.settings.defaultRoom]);
+				mediaStream.changeRoom($scope.master.settings.defaultRoom, true);
+			}
+
 			// Always apply room after self received to avoid double stuff.
 			mediaStream.applyRoom();