Index: lams_central/src/flash/org/lamsfoundation/lams/wizard/Wizard.as
===================================================================
diff -u -reb909c93b528103253e51c47b25b30f6fdd6b60d -r861c2034bd21168e897f71b5c514c32fb2b740d7
--- lams_central/src/flash/org/lamsfoundation/lams/wizard/Wizard.as	(.../Wizard.as)	(revision eb909c93b528103253e51c47b25b30f6fdd6b60d)
+++ lams_central/src/flash/org/lamsfoundation/lams/wizard/Wizard.as	(.../Wizard.as)	(revision 861c2034bd21168e897f71b5c514c32fb2b740d7)
@@ -252,10 +252,11 @@
 		var designId:Number = resultDTO.selectedResourceID;
 		var lessonName:String = resultDTO.resourceTitle;
 		var lessonDesc:String = resultDTO.resourceDescription;
+		var orgId:Number = resultDTO.organisationID;
 		if(lessonDesc == undefined){
-			Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=initializeLesson&learningDesignID='+designId+'&userID='+_root.userID+'&lessonName='+lessonName,callback, false);
+			Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=initializeLesson&learningDesignID='+designId+'&userID='+_root.userID+'&lessonName='+lessonName+'&organisationID='+orgId,callback, false);
 		} else {
-			Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=initializeLesson&learningDesignID='+designId+'&userID='+_root.userID+'&lessonName='+lessonName+'&lessonDescription='+lessonDesc,callback, false);
+			Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=initializeLesson&learningDesignID='+designId+'&userID='+_root.userID+'&lessonName='+lessonName+'&lessonDescription='+lessonDesc+'&organisationID='+orgId,callback, false);
 		}
 	}
 	
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -rd3fa61e84b3800916249a4141c670ab53d878a53 -r861c2034bd21168e897f71b5c514c32fb2b740d7
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision d3fa61e84b3800916249a4141c670ab53d878a53)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 861c2034bd21168e897f71b5c514c32fb2b740d7)
@@ -523,32 +523,6 @@
         newLesson.setLessonClass(newLessonClass);
         newLesson.setOrganisation(organisation);
         
-        // put the copied design in the class/course default workspace folder for run sequences
-        WorkspaceFolder folder;
-        try {
-	        if(organisation.getWorkspace() == null)
-	        	folder = organisation.getParentOrganisation().getWorkspace().getDefaultRunSequencesFolder();
-	        else
-	        	folder = organisation.getWorkspace().getDefaultRunSequencesFolder();
-	        
-	        if(folder != null) {
-	        	newLesson.getLearningDesign().setWorkspaceFolder(folder);
-	        	Iterator it = folder.getLearningDesigns().iterator();
-	        	String title = newLesson.getLearningDesign().getTitle();
-	        	
-	        	while(it.hasNext()){
-	        		LearningDesign ld = (LearningDesign)it.next();
-	        		if(ld.getTitle().equals(title)){
-	        			newLesson.getLearningDesign().setTitle(title + '_' + newLesson.getCreateDateTime().toString());
-	        			break;
-	        		}
-	        	}
-	        }
-	        
-        } catch (NullPointerException e){
-        	// no workspace folder could be found (possibly running lesson preview)
-        }
-        
         lessonDAO.updateLesson(newLesson);
         
         if ( oldLessonClass != null ) {
Index: lams_monitoring/web/lams_wizard.swf
===================================================================
diff -u -r1d384edcc5921b65eedd6e9eabde133236edbf6d -r861c2034bd21168e897f71b5c514c32fb2b740d7
Binary files differ