Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/business/WizardManager.as
===================================================================
diff -u -r58860805a9ca7a628058c2c280fc27cf3547d3ae -r37f2fc4422b5487b4e692e70010e909a509a3a3f
--- lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/business/WizardManager.as	(.../WizardManager.as)	(revision 58860805a9ca7a628058c2c280fc27cf3547d3ae)
+++ lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/business/WizardManager.as	(.../WizardManager.as)	(revision 37f2fc4422b5487b4e692e70010e909a509a3a3f)
@@ -32,7 +32,6 @@
 		private var _usersLoaded:Boolean;
 		
 		private var _lessonID:uint;
-		private var _organisationID:uint;
 		private var _initializedLesson:Lesson;
 		
 		private var _lessonInstances:Array;
@@ -105,11 +104,10 @@
 		
 		/*-.........................................Methods..........................................*/
 		
-		public function initWorkspace(organisationID:uint):WorkspaceItem {
+		public function initWorkspace():WorkspaceItem {
 			var item:WorkspaceItem = new WorkspaceItem();
 			item.populate({name: "root", description: "root node", resourceID: -1, resourceType:WorkspaceItem.RT_FOLDER});
 			
-			_organisationID = organisationID;
 			_workspaceRoot = item;
 			
 			dispatchEvent(new Event("workspaceRootChanged"));
@@ -126,12 +124,12 @@
    				
    				newItem.parentWorkspaceFolderID = folder.workspaceFolderID;
   				
-  				if(newItem.resourceID == _organisationID)
-  					foldersToOpen.push(newItem); 
-  				
   				folder.children.addItem(newItem);
    			}
    			
+   			if(folder.resourceID == -1)
+  				foldersToOpen.push(folder.children.getItemAt(0));
+   			
    			return foldersToOpen;
 		}
 		
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml
===================================================================
diff -u -r58860805a9ca7a628058c2c280fc27cf3547d3ae -r37f2fc4422b5487b4e692e70010e909a509a3a3f
--- lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision 58860805a9ca7a628058c2c280fc27cf3547d3ae)
+++ lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision 37f2fc4422b5487b4e692e70010e909a509a3a3f)
@@ -54,7 +54,7 @@
 	</EventHandlers>
 
 	<EventHandlers type="{WizardEvent.INIT_WORKSPACE}">
-		<MethodInvoker generator="{WizardManager}" method="initWorkspace" arguments="{event.organisationID}" />
+		<MethodInvoker generator="{WizardManager}" method="initWorkspace" />
 		<EventAnnouncer generator="{WizardEvent}" type="{WizardEvent.GET_FOLDER_CONTENTS}">
 			<Properties folder="{lastReturn}" folderID="{lastReturn.resourceID}" /> 
 		</EventAnnouncer>
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml
===================================================================
diff -u -r952b4d2e3e70d81501b3a11818f94f7a606b2201 -r37f2fc4422b5487b4e692e70010e909a509a3a3f
--- lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml	(.../Lesson.mxml)	(revision 952b4d2e3e70d81501b3a11818f94f7a606b2201)
+++ lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml	(.../Lesson.mxml)	(revision 37f2fc4422b5487b4e692e70010e909a509a3a3f)
@@ -64,8 +64,6 @@
    				organisationID = Application.application.parameters.organisationID;
    				
    				var wizardEvent:WizardEvent = new WizardEvent(WizardEvent.INIT_WORKSPACE);
-   				wizardEvent.organisationID = organisationID;
-   				
    				this.dispatchEvent(wizardEvent);
    				
    			}
Index: lams_monitoring/web/CloudWizard.swf
===================================================================
diff -u -r952b4d2e3e70d81501b3a11818f94f7a606b2201 -r37f2fc4422b5487b4e692e70010e909a509a3a3f
Binary files differ