Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
diff -u -r0e66509873fc444acd2cd006e3f909d5dfda6f54 -r47f9596122f574a84f22d7cd6f6ebef83d65130d
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 0e66509873fc444acd2cd006e3f909d5dfda6f54)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 47f9596122f574a84f22d7cd6f6ebef83d65130d)
@@ -316,22 +316,10 @@
 		}
 		mcAuthoringForm.resetUserAction();
 		
-		logger.debug("will return to jsp.");
-		if ((sourceMcStarter != null) && !sourceMcStarter.equals("monitoring"))
-		{
-			logger.debug("request is from authoring or define Later url. return to: " + LOAD_QUESTIONS);
-			return (mapping.findForward(LOAD_QUESTIONS));	
-		}
-		else if (sourceMcStarter == null)
-		{
-			logger.debug("request is from authoring url. return to: " + LOAD_QUESTIONS);
-			return (mapping.findForward(LOAD_QUESTIONS));	
-		}
-		else
-		{
-			logger.debug("request is from amonitoring url. return to: " + LOAD_MONITORING);
-			return (mapping.findForward(LOAD_MONITORING));	
-		}
+		logger.debug("will return to jsp with: " + sourceMcStarter);
+		String destination=McUtils.getDestination(sourceMcStarter);
+		logger.debug("destination: " + destination);
+		return (mapping.findForward(destination));
 	} 
 
 	/**