Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java
===================================================================
diff -u -r236e24f95afeb37f5ffe8370772b4396b942b25f -r20809dc1982bb776da72ef292f4033724643a4b3
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java	(.../NbAuthoringAction.java)	(revision 236e24f95afeb37f5ffe8370772b4396b942b25f)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java	(.../NbAuthoringAction.java)	(revision 20809dc1982bb776da72ef292f4033724643a4b3)
@@ -127,7 +127,6 @@
 		String contentFolderId = WebUtil.readStrParam(request, NoticeboardConstants.CONTENT_FOLDER_ID);
 		
 		nbForm.setToolContentID(contentId.toString());
-		nbForm.setContentFolderID(contentFolderId);
 		
 		/* DefineLater is used in the basic screen. If defineLater is set, then in the authoring page,
 		 * the two tabs {Advanced, Instructions} are not visible.
@@ -157,6 +156,7 @@
 			
 			//initialise the values in the form, so the values will be shown in the jsp
 			nbForm.setToolContentID(contentId.toString());
+			nbForm.setContentFolderID(contentFolderId);
 			nbForm.setTitle(nb.getTitle());
 			nbForm.setContent(nb.getContent());
 			nbForm.setOnlineInstructions(nb.getOnlineInstructions());
@@ -179,6 +179,7 @@
 			    /* Define later set to true when the edit activity tab is brought up 
 			     * So that users cannot start using the content while the staff member is editing the content */
 			    nbForm.populateFormWithNbContentValues(nb);
+			    nbForm.setContentFolderID(contentFolderId);
 			    nb.setDefineLater(Boolean.parseBoolean(nbForm.getDefineLater()));
 			    nbService.saveNoticeboard(nb);
 			    
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java
===================================================================
diff -u -re2a59c50e8e06ff895161c92e5d9eb74aadc446a -r20809dc1982bb776da72ef292f4033724643a4b3
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	(.../NbMonitoringAction.java)	(revision e2a59c50e8e06ff895161c92e5d9eb74aadc446a)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	(.../NbMonitoringAction.java)	(revision 20809dc1982bb776da72ef292f4033724643a4b3)
@@ -43,6 +43,7 @@
 import org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService;
 import org.lamsfoundation.lams.tool.noticeboard.service.NoticeboardServiceProxy;
 import org.lamsfoundation.lams.tool.noticeboard.util.NbWebUtil;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 
 /**
@@ -82,7 +83,8 @@
     		HttpServletResponse response) throws NbApplicationException
     {
     	Long toolContentId = NbWebUtil.convertToLong(request.getParameter(NoticeboardConstants.TOOL_CONTENT_ID));
-        if (toolContentId == null)
+        String contentFolderID = WebUtil.readStrParam(request, NoticeboardConstants.CONTENT_FOLDER_ID);
+    	if (toolContentId == null)
  		{
  		    String error = "Unable to continue. Tool content id missing";
  		    logger.error(error);
@@ -94,7 +96,6 @@
         INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
 		NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId);
 
-		monitorForm.setToolContentID(toolContentId.toString());
     	monitorForm.setTitle(content.getTitle());
     	monitorForm.setContent(content.getContent());
     	monitorForm.setOnlineInstructions(content.getOnlineInstructions());
@@ -107,6 +108,7 @@
 		    Map<String,Object> map = new HashMap<String,Object>();
 		    map.put(NoticeboardConstants.TOOL_CONTENT_ID, toolContentId.toString());
 		    map.put(NoticeboardConstants.DEFINE_LATER, "true");
+		    map.put(NoticeboardConstants.CONTENT_FOLDER_ID, contentFolderID);
 		    monitorForm.setParametersToAppend(map);
 		} else {
 			monitorForm.setContentEditable("false");
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java
===================================================================
diff -u -reac1a7689dc88e224668832952fc27c8b732a8a9 -r20809dc1982bb776da72ef292f4033724643a4b3
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java	(.../NbMonitoringForm.java)	(revision eac1a7689dc88e224668832952fc27c8b732a8a9)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java	(.../NbMonitoringForm.java)	(revision 20809dc1982bb776da72ef292f4033724643a4b3)
@@ -112,7 +112,6 @@
     public void setToolContentID(String toolContentId) {
         this.toolContentID = toolContentId;
     }
-    
     public void reset(ActionMapping mapping, HttpServletRequest request)
 	{
 		this.method = null;