Index: tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/actions/LearningAction.java
===================================================================
diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rdf4b6219e1a88f0395eb11292e5e3cb7e7750397
--- tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/actions/LearningAction.java	(.../LearningAction.java)	(revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b)
+++ tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/actions/LearningAction.java	(.../LearningAction.java)	(revision df4b6219e1a88f0395eb11292e5e3cb7e7750397)
@@ -38,11 +38,11 @@
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
+import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossaryUser;
 import org.lamsfoundation.lams.tool.mdglos.dto.MdlGlossaryDTO;
 import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossary;
 import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossaryConfigItem;
 import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossarySession;
-import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossaryUser;
 import org.lamsfoundation.lams.tool.mdglos.service.IMdlGlossaryService;
 import org.lamsfoundation.lams.tool.mdglos.service.MdlGlossaryServiceProxy;
 import org.lamsfoundation.lams.tool.mdglos.util.MdlGlossaryConstants;
@@ -98,6 +98,7 @@
 	}
 
 	MdlGlossary mdlGlossary = mdlGlossarySession.getMdlGlossary();
+	MdlGlossaryUser mdlGlossaryUser = getCurrentUser(toolSessionID);
 
 	// check defineLater
 	if (mdlGlossary.isDefineLater()) {
@@ -127,7 +128,7 @@
 				{
 					responseUrl += RELATIVE_TEACHER_URL;
 				}
-				else if (mode.equals(ToolAccessMode.LEARNER))
+				else if (mode.equals(ToolAccessMode.LEARNER) || mode.equals(ToolAccessMode.AUTHOR))
 				{
 					responseUrl += RELATIVE_LEARNER_URL;
 				}
@@ -141,7 +142,7 @@
 		
 
 		responseUrl += "&id=" + mdlGlossarySession.getExtSessionId() + "&returnUrl=" + returnUrl
-			+ "&dest=" + encodedMoodleRelativePath + "&is_learner=1";
+			+ "&dest=" + encodedMoodleRelativePath + "&is_learner=1" + "&isFinished=" + mdlGlossaryUser.isFinishedActivity();
 		
 		
 		log.debug("Redirecting for mdl glossary learner: " + responseUrl);