Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
===================================================================
diff -u -rd20cc2eab0982891a206a72301e9ff0306184ed1 -rd7f1b597ea2ce34ca7356f802dea5394f0ffd19e
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision d20cc2eab0982891a206a72301e9ff0306184ed1)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision d7f1b597ea2ce34ca7356f802dea5394f0ffd19e)
@@ -93,6 +93,9 @@
 			String nextUrl = getLamsUrl() + "authoringConfirm.jsp";
 			String signature = request.getParameter(TOOL_SIGNATURE);
 			Long toolContentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+			
+			String contentFolderID = "TODO_remove-change_optional_to_false";
+			contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID, true);
 
 			//check whether it use on define it later page
 			IToolVO tool = getToolService().getToolBySignature(signature);
@@ -104,10 +107,15 @@
 				//define it later page
 				reeditUrl = WebUtil.appendParameterToURL(getLamsUrl()+tool.getDefineLaterUrl(), AttributeNames.PARAM_TOOL_CONTENT_ID,
 						toolContentId.toString());
+				reeditUrl = WebUtil.appendParameterToURL(reeditUrl, AttributeNames.PARAM_CONTENT_FOLDER_ID,
+						contentFolderID);
+								
 			}else{
 				//authoring page
 				reeditUrl = WebUtil.appendParameterToURL(getLamsUrl()+tool.getAuthorUrl(), AttributeNames.PARAM_TOOL_CONTENT_ID,
 						toolContentId.toString());
+				reeditUrl = WebUtil.appendParameterToURL(reeditUrl, AttributeNames.PARAM_CONTENT_FOLDER_ID,
+						contentFolderID);
 			}
 			
 			nextUrl = WebUtil.appendParameterToURL(nextUrl,RE_EDIT_URL,URLEncoder.encode(reeditUrl,"UTF-8"));