Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AdminController.java
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r39e351aeeadf3d0973293c74f0c89432a954d2e8
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AdminController.java	(.../AdminController.java)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AdminController.java	(.../AdminController.java)	(revision 39e351aeeadf3d0973293c74f0c89432a954d2e8)
@@ -64,6 +64,6 @@
 	forumService.saveForumConfigItem(keepLearnerContent);
 
 	request.setAttribute("savedSuccess", true);
-	return "jsps/admin/configE";
+	return "jsps/admin/config";
     }
 }
\ No newline at end of file
Index: lams_tool_forum/web/jsps/admin/config.jsp
===================================================================
diff -u -r37c404bc2d0032716112057bebc1314cbc30d102 -r39e351aeeadf3d0973293c74f0c89432a954d2e8
--- lams_tool_forum/web/jsps/admin/config.jsp	(.../config.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
+++ lams_tool_forum/web/jsps/admin/config.jsp	(.../config.jsp)	(revision 39e351aeeadf3d0973293c74f0c89432a954d2e8)
@@ -26,8 +26,9 @@
 			<form:form action="saveContent.do" id="adminForm" modelAttribute="adminForm" method="post" enctype="multipart/form-data">
 				<div class="checkbox">
 					<label for="keepLearnerContent">
-					<form:checkbox path="keepLearnerContent"/>
-					<fmt:message key="admin.keep.learner.content" /></label>
+						<form:checkbox path="keepLearnerContent" id="keepLearnerContent"/>
+						<fmt:message key="admin.keep.learner.content" />
+					</label>
 				</div>
 				<button type="submit" class="btn btn-primary pull-right" ><fmt:message key="admin.button.save" /></button>
 			</form:form>
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AdminController.java
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -r39e351aeeadf3d0973293c74f0c89432a954d2e8
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AdminController.java	(.../AdminController.java)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AdminController.java	(.../AdminController.java)	(revision 39e351aeeadf3d0973293c74f0c89432a954d2e8)
@@ -38,7 +38,6 @@
 
 /**
  * @author Andrey Balan
- * @version
  */
 @Controller
 @RequestMapping("/laimag10admin")
@@ -50,7 +49,7 @@
 
     @Autowired
     @Qualifier("laimagMessageService")
-    private static MessageService messageService;
+    private MessageService messageService;
 
     @RequestMapping("/start")
     public String start(@ModelAttribute AdminForm adminForm, HttpServletRequest request) {