Index: lams_build/lib/lams/lams-central.jar
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r52f09d3d3dd6998ff9cb9e7377c7501341ad7a23
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r52f09d3d3dd6998ff9cb9e7377c7501341ad7a23
--- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java	(.../PasswordChangeController.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java	(.../PasswordChangeController.java)	(revision 52f09d3d3dd6998ff9cb9e7377c7501341ad7a23)
@@ -41,6 +41,7 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -69,8 +70,8 @@
      *            The HTTP response we are creating
      *
      */
-    @RequestMapping("/passwordChanged")
-    public String execute(@ModelAttribute PasswordChangeActionForm passwordChangeForm, HttpServletRequest request)
+    @RequestMapping(path = "/passwordChanged", method = RequestMethod.POST)
+    public String execute(@ModelAttribute("PasswordChangeActionForm") PasswordChangeActionForm passwordChangeForm, HttpServletRequest request)
 	    throws Exception {
 	// -- isCancelled?
 	if (request.getAttribute(Globals.CANCEL_KEY) != null) {
Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordController.java
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r52f09d3d3dd6998ff9cb9e7377c7501341ad7a23
--- lams_central/src/java/org/lamsfoundation/lams/web/PasswordController.java	(.../PasswordController.java)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordController.java	(.../PasswordController.java)	(revision 52f09d3d3dd6998ff9cb9e7377c7501341ad7a23)
@@ -36,7 +36,7 @@
 public class PasswordController {
 
     @RequestMapping("/password")
-    public String execute(@ModelAttribute PasswordChangeActionForm passwordChangeForm, HttpServletRequest request)
+    public String execute(@ModelAttribute("PasswordChangeActionForm") PasswordChangeActionForm passwordChangeForm, HttpServletRequest request)
 	    throws Exception {
 
 	passwordChangeForm.setLogin(request.getRemoteUser());
Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitController.java
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r52f09d3d3dd6998ff9cb9e7377c7501341ad7a23
--- lams_central/src/java/org/lamsfoundation/lams/web/PortraitController.java	(.../PortraitController.java)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitController.java	(.../PortraitController.java)	(revision 52f09d3d3dd6998ff9cb9e7377c7501341ad7a23)
@@ -42,10 +42,10 @@
     private static Logger log = Logger.getLogger(PortraitController.class);
     @Autowired
     @Qualifier("userManagementService")
-    private static IUserManagementService service;
+    private IUserManagementService service;
 
     @RequestMapping("/portrait")
-    public String execute(@ModelAttribute PortraitActionForm portraitForm, HttpServletRequest request)
+    public String execute(@ModelAttribute("PortraitActionForm") PortraitActionForm portraitForm, HttpServletRequest request)
 	    throws Exception {
 
 	Long portraitUuid = service.getUserByLogin(request.getRemoteUser()).getPortraitUuid();
Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r52f09d3d3dd6998ff9cb9e7377c7501341ad7a23
--- lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java	(.../PortraitSaveController.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java	(.../PortraitSaveController.java)	(revision 52f09d3d3dd6998ff9cb9e7377c7501341ad7a23)
@@ -55,6 +55,7 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -64,7 +65,7 @@
  * @author Andrey Balan
  */
 @Controller
-@RequestMapping("/saveportrait")
+@RequestMapping(path = "/saveportrait", method = RequestMethod.POST)
 public class PortraitSaveController {
 
     private static Logger log = Logger.getLogger(PortraitSaveController.class);
@@ -86,7 +87,7 @@
      * Upload portrait image.
      */
     @RequestMapping("")
-    public String unspecified(@ModelAttribute PortraitActionForm portraitForm, HttpServletRequest request,
+    public String unspecified(@ModelAttribute("PortraitActionForm") PortraitActionForm portraitForm, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
 	if (request.getAttribute(Globals.CANCEL_KEY) != null) {
Index: lams_central/web/includes/javascript/main.js
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r52f09d3d3dd6998ff9cb9e7377c7501341ad7a23
--- lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 52f09d3d3dd6998ff9cb9e7377c7501341ad7a23)
@@ -526,7 +526,7 @@
 			var orgID = $(this).data('orgID');
 			// load contents after opening the dialog
 			$('iframe', this).attr('src', LAMS_URL
-				+ 'findUserLessons.do?dispatch=getResults&courseID=' + orgID);
+				+ 'findUserLessons/getResults.do?courseID=' + orgID);
 		}
 	}, true);
 }
Index: lams_central/web/passwordChangeContent.jsp
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r52f09d3d3dd6998ff9cb9e7377c7501341ad7a23
--- lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 52f09d3d3dd6998ff9cb9e7377c7501341ad7a23)
@@ -170,7 +170,7 @@
 									placeholder="<fmt:message key='label.password.confirm.new.password' />" maxlength="25"/>
 							</div>
 							<div class="form-group" align="right">
-							<input type="submit" name="org.apache.struts.taglib.html.CANCEL" value="<fmt:message key="button.cancel"/>" formnovalidate="formnovalidate" onclick="bCancel=true;" id="cancelButton" class="btn btn-sm btn-default voffset5"/>
+							<a href="/lams/profile.jsp" type="submit" id="cancelButton" class="btn btn-sm btn-default voffset5"><fmt:message key="button.cancel"/></a>
 								&nbsp;&nbsp;
 								<button class="btn btn-sm btn-primary voffset5">
 									<fmt:message key="button.save" />
Index: lams_central/web/portrait.jsp
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r52f09d3d3dd6998ff9cb9e7377c7501341ad7a23
--- lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision 52f09d3d3dd6998ff9cb9e7377c7501341ad7a23)
@@ -5,7 +5,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
-
+<c:set var="lams"><lams:LAMSURL /></c:set>
 <lams:html>
 <lams:head>
 	<lams:css/>
@@ -30,12 +30,12 @@
 		}
 	</style>
 
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="includes/javascript/profile.js"></script>
-	<script type="text/javascript" src="includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.blockUI.js"></script>
-	<script type="text/javascript" src="includes/javascript/webrtc-capturestill.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/profile.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/webrtc-capturestill.js"></script>
 	<script type="text/javascript">
 		//constant for croppie.js
 		var PORTRAIT_SIZE = 400;
@@ -124,7 +124,7 @@
 </lams:head>
 
 <body>
-<form:form action="/saveportrait.do" method="post" modelAttribute="PortraitActionForm"	 id="PortraitActionForm" enctype="multipart/form-data">
+<form:form action="saveportrait.do" method="post" modelAttribute="PortraitActionForm"	 id="PortraitActionForm" enctype="multipart/form-data">
 	<form:hidden name="PortraitActionForm" path="portraitUuid" />
 	<div style="clear: both"></div>
 	
Index: lams_central/web/profile.jsp
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r52f09d3d3dd6998ff9cb9e7377c7501341ad7a23
--- lams_central/web/profile.jsp	(.../profile.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/web/profile.jsp	(.../profile.jsp)	(revision 52f09d3d3dd6998ff9cb9e7377c7501341ad7a23)
@@ -46,15 +46,15 @@
 							</c:when>
 							<c:otherwise>
 								<img style="margin: 0 auto;" class="img-circle img-responsive"
-									title="<bean:write name="fullName" />"
-									src="/lams/download/?uuid=<bean:write name="portraitUuid" />&version=2&preferDownload=false" />
+									title="<c:out value='fullName' />"
+									src="/lams/download/?uuid=<c:out value="portraitUuid" />&version=2&preferDownload=false" />
 							</c:otherwise>
 						</c:choose>
 
 						<p class="text-center">
-							<bean:write name="fullName" />
+							<c:out value="fullName" />
 								<br /> <i class="fa fa-envelope small"></i>
-							<bean:write name="email" />
+							<c:out value="email" />
 						</p>
 					</div>
 					<hr>