Index: lams_central/src/flash/org/lamsfoundation/lams/wizard/Wizard.as
===================================================================
diff -u -rb13084c835a0bdf42c3900d6be2476cf4c2e1285 -reb909c93b528103253e51c47b25b30f6fdd6b60d
--- lams_central/src/flash/org/lamsfoundation/lams/wizard/Wizard.as	(.../Wizard.as)	(revision b13084c835a0bdf42c3900d6be2476cf4c2e1285)
+++ lams_central/src/flash/org/lamsfoundation/lams/wizard/Wizard.as	(.../Wizard.as)	(revision eb909c93b528103253e51c47b25b30f6fdd6b60d)
@@ -141,11 +141,11 @@
 		
 		var callback:Function = Proxy.create(this,showOrgTree);
            
-		if(classID != undefined){
-			Application.getInstance().getComms().getRequest('workspace.do?method=getUserOrganisation&userID='+_root.userID+'&organisationID='+classID+'&roles=STAFF,TEACHER',callback, false);
+		if(classID != undefined && courseID != undefined){
+			Application.getInstance().getComms().getRequest('workspace.do?method=getOrganisationsByUserRole&userID='+_root.userID+'&courseID='+courseID+'&classID='+classID+'&roles=STAFF,TEACHER',callback, false);
 		}else if(courseID != undefined){
 			trace('course defined: doing request');
-			Application.getInstance().getComms().getRequest('workspace.do?method=getOrganisationsByUserRole&userID='+_root.userID+'&organisationID='+courseID+'&roles=STAFF,TEACHER',callback, false);
+			Application.getInstance().getComms().getRequest('workspace.do?method=getOrganisationsByUserRole&userID='+_root.userID+'&courseID='+courseID+'&roles=STAFF,TEACHER',callback, false);
 		}else{
 			// TODO no course or class defined
 		}
@@ -163,13 +163,17 @@
 		//rootNode.attributes.isBranch = true;
 		wizardModel.setOrganisationResource(RT_ORG+'_'+odto.organisationID,rootNode);
 		if(_root.classID != undefined){
-			wizardView.setUpOrgTree(false);
+			// create tree xml branches
+			createXMLNodes(rootNode, dto.nodes);
+			
+			
+			wizardView.setUpOrgTree(true);
 		}else{
 			// create tree xml branches
 			createXMLNodes(rootNode, dto.nodes);
 			
 			// set up the org tree
-			wizardView.setUpOrgTree(true);
+			wizardView.setUpOrgTree(false);
 		}
 	}
 
Index: lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as
===================================================================
diff -u -r0a966091b6bf3c9d304652575b52a9298db26651 -reb909c93b528103253e51c47b25b30f6fdd6b60d
--- lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as	(.../WizardView.as)	(revision 0a966091b6bf3c9d304652575b52a9298db26651)
+++ lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as	(.../WizardView.as)	(revision eb909c93b528103253e51c47b25b30f6fdd6b60d)
@@ -389,9 +389,10 @@
 	 * @param   node 
 	 * @return  
 	 */
-    private function setBranches(node:XMLNode){
+    private function setBranches(treeview:Tree, node:XMLNode, isOpen:Boolean){
 		if(node.hasChildNodes() || node.attributes.isBranch){
-			location_treeview.setIsBranch(node, true);
+			treeview.setIsBranch(node, true);
+			if(isOpen){ treeview.setIsOpen(node, true);}
 			for (var i = 0; i<node.childNodes.length; i++) {
 				var cNode = node.getTreeNodeAt(i);
 				setBranches(cNode);				
@@ -405,7 +406,7 @@
 	 * @usage   
 	 * @return  
 	 */
-	private function setUpBranchesInit(treeview:Tree, data:XML, hideRoot:Boolean){
+	private function setUpBranchesInit(treeview:Tree, data:XML, hideRoot:Boolean, isOpen:Boolean){
 		Debugger.log('Running...',Debugger.GEN,'setUpBranchesInit','org.lamsfoundation.lams.wizard.WizardView');
 		//get the 1st child
 		
@@ -421,7 +422,7 @@
 		}
 		var fNode = treeview.dataProvider.firstChild;
 		trace(fNode);
-		setBranches(fNode);
+		setBranches(treeview, fNode, isOpen);
 		treeview.refresh();
 	}
 	
@@ -434,7 +435,7 @@
 	 */
 	private function setUpTreeview(){
 			
-		setUpBranchesInit(location_treeview, WorkspaceModel(workspaceView.getModel()).treeDP, false);
+		setUpBranchesInit(location_treeview, WorkspaceModel(workspaceView.getModel()).treeDP, false, false);
 		_workspaceController = _workspaceView.getController();
 		location_treeview.addEventListener("nodeOpen", Delegate.create(_workspaceController, _workspaceController.onTreeNodeOpen));
 		location_treeview.addEventListener("nodeClose", Delegate.create(_workspaceController, _workspaceController.onTreeNodeClose));
@@ -451,7 +452,7 @@
 			
 		//Debugger.log('_workspaceView:'+_workspaceView,Debugger.GEN,'setUpTreeview','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
 		
-		setUpBranchesInit(org_treeview, WizardModel(getModel()).treeDP, hideRoot);
+		setUpBranchesInit(org_treeview, WizardModel(getModel()).treeDP, hideRoot, true);
 		
 		org_treeview.addEventListener("nodeOpen", Delegate.create(_wizardController, _wizardController.onTreeNodeOpen));
 		org_treeview.addEventListener("nodeClose", Delegate.create(_wizardController, _wizardController.onTreeNodeClose));