Index: lams_flash/src/central/flex/CloudWizard/src/CloudWizard.mxml
===================================================================
diff -u -r6710ffa47b5b99cb033f76dc5df2cc729cd34ce0 -r43909c9a2c4f3c7a1db92c7e08dcba07a3c9c734
--- lams_flash/src/central/flex/CloudWizard/src/CloudWizard.mxml	(.../CloudWizard.mxml)	(revision 6710ffa47b5b99cb033f76dc5df2cc729cd34ce0)
+++ lams_flash/src/central/flex/CloudWizard/src/CloudWizard.mxml	(.../CloudWizard.mxml)	(revision 43909c9a2c4f3c7a1db92c7e08dcba07a3c9c734)
@@ -16,7 +16,7 @@
 			public var orgName:String;
 			
 			private function init():void {
-				mainMap.init(Application.application.param("serverUrl") as String, uint(Application.application.param("userID")));
+				mainMap.init(Application.application.param("serverUrl") as String, uint(Application.application.param("userID")), uint(Application.application.param("organisationID")));
 			}
 			
 			public function param(object:String):Object {
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml
===================================================================
diff -u -r6710ffa47b5b99cb033f76dc5df2cc729cd34ce0 -r43909c9a2c4f3c7a1db92c7e08dcba07a3c9c734
--- lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision 6710ffa47b5b99cb033f76dc5df2cc729cd34ce0)
+++ lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision 43909c9a2c4f3c7a1db92c7e08dcba07a3c9c734)
@@ -22,9 +22,18 @@
 			[Bindable]
 			private var userID:uint;
 			
-			public function init(url:String, id:uint):void {
+			[Bindable]
+			private var orgID:uint;
+			
+			public function init(url:String, id:uint, orgId:uint):void {
 				serverURL = url;
 				userID = id;
+				orgID = orgId;
+				
+				// Uncomment to test in debug
+				//serverURL = "http://localhost:8080/lams/";
+				//userID = 5; 		// test1
+				//orgID = 2; 		// Playpen
 			}
 			
 		]]>
@@ -46,7 +55,7 @@
 	<EventHandlers type="{FlexEvent.APPLICATION_COMPLETE}">
 		<!-- load dict data -->
 		<HTTPServiceInvoker instance="{dictionaryService}">
-			<Request module="wizard" />
+			<Request module="wizard" orgId="{orgID}"/>
 			<resultHandlers>
 				<MethodInvoker generator="{WizardManager}" method="setDictionary" arguments="{resultObject}" />
 			</resultHandlers>
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml
===================================================================
diff -u -r6710ffa47b5b99cb033f76dc5df2cc729cd34ce0 -r43909c9a2c4f3c7a1db92c7e08dcba07a3c9c734
--- lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml	(.../Wizard.mxml)	(revision 6710ffa47b5b99cb033f76dc5df2cc729cd34ce0)
+++ lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml	(.../Wizard.mxml)	(revision 43909c9a2c4f3c7a1db92c7e08dcba07a3c9c734)
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:Panel xmlns:mx="http://www.adobe.com/2006/mxml" xmlns:views="org.lamsfoundation.lams.views.*" 
-	xmlns:mate="http://mate.asfusion.com/" width="100%" height="100%" 
-   	preinitialize="init()" title="{dictionary.getLabelAndInsert('add.lesson.panel.title', [orgName])}" horizontalAlign="center" layout="absolute">
+	xmlns:mate="http://mate.asfusion.com/" 
+	width="100%" height="100%"  
+	title="{dictionary.getLabelAndInsert('add.lesson.panel.title', [dictionary.getLabel('orgName')])}" 
+	horizontalAlign="center" layout="absolute">
 	
 	<mx:Script>
 		<![CDATA[
@@ -26,13 +28,6 @@
 			[Bindable]
 			public var dictionary:XMLDictionaryRegistry;
 			
-			[Bindable]
-			public var orgName:String;
-			
-			private function init():void {
-				orgName = Application.application.param("orgName") as String;
-			}
-			
 			private function tabChange(event:IndexChangedEvent):void {
 				clearValidationFocus();
 				
@@ -88,7 +83,7 @@
 		<!-- Tab row -->
 		<mx:TabNavigator id="tabViews" width="100%" height="100%" change="tabChange(event)" creationPolicy="all">
 			<views:Lesson id="lessonView" label="{dictionary.getLabel('lesson.tab.label')}" learners="{learnersView}" advanced="{advancedView}" />
-			<views:Learners id="learnersView" label="{dictionary.getLabel('class.tab.label')}" lesson="{lessonView}" learnersGroupName="{dictionary.getLabelAndInsert('learners.group.name', [orgName])}" staffGroupName="{dictionary.getLabelAndInsert('staff.group.name', [orgName])}"/>
+			<views:Learners id="learnersView" label="{dictionary.getLabel('class.tab.label')}" lesson="{lessonView}" learnersGroupName="{dictionary.getLabelAndInsert('learners.group.name', [dictionary.getLabel('orgName')])}" staffGroupName="{dictionary.getLabelAndInsert('staff.group.name', [dictionary.getLabel('orgName')])}"/>
 			<views:Advanced id="advancedView" label="{dictionary.getLabel('advanced.tab.label')}" learners="{learnersView}" lesson="{lessonView}" />
 		</mx:TabNavigator>
 		<mx:HBox horizontalAlign="right" width="100%" paddingRight="10">
Index: lams_monitoring/web/CloudWizard.swf
===================================================================
diff -u -r2e7ee272702e00a7d0f2d3522c7af43d319ffce8 -r43909c9a2c4f3c7a1db92c7e08dcba07a3c9c734
Binary files differ