Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/AuthoringController.java
===================================================================
diff -u -r1a38a53a5722b2ec58f85c7506b11a2e71897870 -rc6221c2f0d3175c3d6fa934a680047845a44d6f4
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 1a38a53a5722b2ec58f85c7506b11a2e71897870)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision c6221c2f0d3175c3d6fa934a680047845a44d6f4)
@@ -171,8 +171,8 @@
     @RequestMapping("/editPage")
     public String editPage(@ModelAttribute AuthoringForm authoringForm, HttpServletRequest request) throws Exception {
 	super.editPage(authoringForm, request);
-	Long currentWikiPageId = WebUtil.readLongParam(request, WikiConstants.ATTR_CURRENT_WIKI);
-	return returnToWiki(authoringForm, request, currentWikiPageId);
+	Long currentPageUid = WebUtil.readLongParam(request, WikiConstants.ATTR_CURRENT_WIKI);
+	return returnToWiki(authoringForm, request, currentPageUid);
     }
 
     @RequestMapping("/revertPage")
@@ -202,8 +202,7 @@
 
     @RequestMapping("/addPage")
     public String addPage(@ModelAttribute AuthoringForm authoringForm, HttpServletRequest request) throws Exception {
-	super.addPage(authoringForm, request);
-	Long currentWikiPageId = WebUtil.readLongParam(request, WikiConstants.ATTR_CURRENT_WIKI);
+	Long currentWikiPageId = super.addPage(authoringForm, request);
 	return returnToWiki(authoringForm, request, currentWikiPageId);
     }
 
@@ -241,6 +240,7 @@
 	return returnToWiki(authoringForm, request, currentWikiPageId);
     }
 
+    @Override
     @RequestMapping("/notifyWikiChange")
     public void notifyWikiChange(Long toolSessionID, String subjectLangKey, String bodyLangKey, WikiUser wikiUser,
 	    HttpServletRequest request) throws Exception {
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/LearningController.java
===================================================================
diff -u -r1a38a53a5722b2ec58f85c7506b11a2e71897870 -rc6221c2f0d3175c3d6fa934a680047845a44d6f4
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/LearningController.java	(.../LearningController.java)	(revision 1a38a53a5722b2ec58f85c7506b11a2e71897870)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/LearningController.java	(.../LearningController.java)	(revision c6221c2f0d3175c3d6fa934a680047845a44d6f4)
@@ -282,16 +282,14 @@
 
     @RequestMapping("/addPage")
     public String addPage(@ModelAttribute LearningForm learningForm, HttpServletRequest request) throws Exception {
-	super.addPage(learningForm, request);
-	Long currentWikiPageId = WebUtil.readLongParam(request, WikiConstants.ATTR_CURRENT_WIKI);
+	Long currentWikiPageId = super.addPage(learningForm, request);
 	return returnToWiki(learningForm, request, currentWikiPageId);
     }
 
     @RequestMapping("/removePage")
     public String removePage(@ModelAttribute LearningForm learningForm, HttpServletRequest request) throws Exception {
 	Long currentPageUid = WebUtil.readLongParam(request, WikiConstants.ATTR_CURRENT_WIKI);
 	super.removePage(learningForm, request);
-	// return to the main page, by setting the current page to null
 	return this.returnToWiki(learningForm, request, currentPageUid);
     }
 
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/MonitoringController.java
===================================================================
diff -u -r1a38a53a5722b2ec58f85c7506b11a2e71897870 -rc6221c2f0d3175c3d6fa934a680047845a44d6f4
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 1a38a53a5722b2ec58f85c7506b11a2e71897870)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision c6221c2f0d3175c3d6fa934a680047845a44d6f4)
@@ -174,18 +174,15 @@
 
     @RequestMapping("/addPage")
     public String addPage(@ModelAttribute MonitoringForm monitoringForm, HttpServletRequest request) throws Exception {
-	super.addPage(monitoringForm, request);
-	Long currentWikiPageId = WebUtil.readLongParam(request, WikiConstants.ATTR_CURRENT_WIKI);
+	Long currentWikiPageId = super.addPage(monitoringForm, request);
 	return returnToWiki(monitoringForm, request, currentWikiPageId);
     }
 
     @RequestMapping("/removePage")
     public String removePage(@ModelAttribute MonitoringForm monitoringForm, HttpServletRequest request)
 	    throws Exception {
-
 	Long currentPageUid = WebUtil.readLongParam(request, WikiConstants.ATTR_CURRENT_WIKI);
 	super.removePage(monitoringForm, request);
-	// return to the main page, by setting the current page to null
 	return this.returnToWiki(monitoringForm, request, currentPageUid);
     }
 
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/WikiPageController.java
===================================================================
diff -u -r035729f521079cf3b9696f60b6b715261af17767 -rc6221c2f0d3175c3d6fa934a680047845a44d6f4
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/WikiPageController.java	(.../WikiPageController.java)	(revision 035729f521079cf3b9696f60b6b715261af17767)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/WikiPageController.java	(.../WikiPageController.java)	(revision c6221c2f0d3175c3d6fa934a680047845a44d6f4)
@@ -252,7 +252,7 @@
     /**
      * Add a new wiki page to this wiki instance
      */
-    protected void addPage(WikiPageForm wikiForm, HttpServletRequest request) throws Exception {
+    protected Long addPage(WikiPageForm wikiForm, HttpServletRequest request) throws Exception {
 
 	Wiki wiki = null;
 	WikiSession session = null;
@@ -302,6 +302,7 @@
 	if ((toolSessionID != null) && (user != null)) {
 	    notifyWikiChange(toolSessionID, "notify.pageAdded.subject", "notify.pageAdded.body", user, request);
 	}
+	return currentPageUid;
     }
 
     /**
Index: lams_tool_wiki/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r035729f521079cf3b9696f60b6b715261af17767 -rc6221c2f0d3175c3d6fa934a680047845a44d6f4
--- lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 035729f521079cf3b9696f60b6b715261af17767)
+++ lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision c6221c2f0d3175c3d6fa934a680047845a44d6f4)
@@ -8,13 +8,13 @@
     }
 
     function continueOrFinish(action) {
-      document.getElementById("learningButtonForm").action += action + ".do";
-      document.getElementById("learningButtonForm").submit();
+      document.getElementById("learningForm").action = action + ".do";
+      document.getElementById("learningForm").submit();
     }
   </script>
 
   <c:if test="${userDTO.finishedActivity and wikiDTO.reflectOnActivity}">
-    <form:form action="learning.do" method="get" id="learningButtonForm" modelAttribute="learningForm">
+    <form:form action="openNotebook.do" method="get" id="learningForm" modelAttribute="learningForm">
       <form:hidden path="mode" value="${mode}" />	
       <form:hidden path="toolSessionID" id="toolSessionID"/>
       <div class="panel panel-default voffset10">
@@ -42,7 +42,7 @@
     </form:form>
   </c:if>
 
-  <form:form action="openNotebook.do" method="post" onsubmit="disableFinishButton();" modelAttribute="learningForm" id="learningButtonForm">
+  <form:form action="openNotebook.do" method="post" onsubmit="disableFinishButton();" modelAttribute="learningForm" id="learningForm">
     <form:hidden path="toolSessionID" id="toolSessionID"/>
     <form:hidden path="mode" value="${mode}" />	
     <div class="pull-right voffset5" id="finishButtonDiv">