Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
===================================================================
diff -u -rc9e22b65129fe7561d7e66f5d6338557b0f3236a -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java	(.../LtiConsumerManagementController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java	(.../LtiConsumerManagementController.java)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -94,7 +94,7 @@
     /**
      * Disables or enables (depending on "disable" parameter) specified LTI tool consumer
      */
-    @RequestMapping(path = "/disable", method = RequestMethod.POST)
+    @RequestMapping(path = "/disable")
     public String disable(HttpServletRequest request) throws Exception {
 
 	initServices();
@@ -111,7 +111,7 @@
     /**
      * Removes specified LTI tool consumer
      */
-    @RequestMapping(path = "/delete", method = RequestMethod.POST)
+    @RequestMapping(path = "/delete")
     public String delete(HttpServletRequest request) throws Exception {
 
 	initServices();
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
===================================================================
diff -u -rc9e22b65129fe7561d7e66f5d6338557b0f3236a -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java	(.../UserController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java	(.../UserController.java)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -373,10 +373,10 @@
 	logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, sysadmin != null ? sysadmin.getUserID() : null, userId,
 		null, null, message);
 	if ((orgId == null) || (orgId == 0)) {
-	    return "redirect:../usersearch.do";
+	    return "forward:/usersearch.do";
 	} else {
 	    request.setAttribute("org", orgId);
-	    return "redirect:../usermanage.do";
+	    return "forward:/usermanage.do";
 	}
     }
 
@@ -399,7 +399,7 @@
 	user.setDisabledFlag(false);
 	service.saveUser(user);
 
-	return "redirect:../disabledmanage.do";
+	return "forward:/disabledmanage.do";
     }
 
 }
\ No newline at end of file
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java	(.../UserManageController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java	(.../UserManageController.java)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -164,7 +164,7 @@
 
     @RequestMapping(path = "/usermanage/forwardError", method = RequestMethod.POST)
     private String forwardError(HttpServletRequest request, String key) {
-	request.setAttribute("errorName", "UserManageAction");
+	request.setAttribute("errorName", "UserManageController");
 	request.setAttribute("errorMessage", messageService.getMessage(key));
 	return "error";
     }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java
===================================================================
diff -u -r9fc1cf92b1b95489621275ef2aca4c18baf6969e -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java	(.../UserOrgRoleController.java)	(revision 9fc1cf92b1b95489621275ef2aca4c18baf6969e)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java	(.../UserOrgRoleController.java)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -28,6 +28,7 @@
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.log4j.Logger;
@@ -65,7 +66,6 @@
  *
  */
 @Controller
-@Scope("session")
 public class UserOrgRoleController {
 
     private static Logger log = Logger.getLogger(UserOrgRoleController.class);
@@ -76,7 +76,7 @@
 
     @RequestMapping(path = "/userorgrole")
     public String execute(@ModelAttribute UserOrgRoleForm userOrgRoleForm, BindingResult result,
-	    HttpServletRequest request) throws Exception {
+	    HttpServletRequest request, HttpSession session) throws Exception {
 
 	service = AdminServiceProxy.getService(applicationContext.getServletContext());
 	// make sure we don't have left overs from any previous attempt
@@ -120,6 +120,8 @@
 	}
 	log.debug("ready to assign roles for " + userOrgRoleForm.getUserBeans().size() + " new users in organisation "
 		+ organisation.getName());
+	
+	session.setAttribute("userOrgRoleForm", userOrgRoleForm);
 
 	return "userorgrole";
     }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java
===================================================================
diff -u -r9fc1cf92b1b95489621275ef2aca4c18baf6969e -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java	(.../UserOrgRoleSaveController.java)	(revision 9fc1cf92b1b95489621275ef2aca4c18baf6969e)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java	(.../UserOrgRoleSaveController.java)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -37,13 +37,13 @@
 import org.lamsfoundation.lams.util.MessageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
 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.bind.annotation.SessionAttributes;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -67,7 +67,7 @@
  *
  */
 @Controller
-@Scope("session")
+@SessionAttributes("userOrgRoleForm")
 public class UserOrgRoleSaveController {
 
     private static Logger log = Logger.getLogger(UserOrgRoleSaveController.class);
@@ -107,7 +107,7 @@
 		errorMap.add("roles", adminMessageService.getMessage("error.roles.empty"));
 		request.setAttribute("errorMap", errorMap);
 		request.setAttribute("orgId", orgId);
-		return "redirect:/userorg.do";
+		return "forward:/userorg.do";
 	    }
 	    service.setRolesForUserOrganisation(user, orgId, Arrays.asList(roleIds));
 	    // FMALIKOFF 5/7/7 Commented out the following code that set the roles in the course if the current org is a class, as the logic
@@ -118,7 +118,7 @@
 	    //	}
 	    //}
 	}
-	return "redirect:/usermanage.do";
+	return "forward:/usermanage.do";
     }
 
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java
===================================================================
diff -u -rc9e22b65129fe7561d7e66f5d6338557b0f3236a -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java	(.../UserOrgSaveController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java	(.../UserOrgSaveController.java)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -131,7 +131,7 @@
 	// if no new users, then finish; otherwise forward to where roles can be assigned for new users.
 	if (newUserOrganisations.isEmpty()) {
 	    log.debug("no new users to add to orgId=" + orgId);
-	    return "redirect:/usermanage.do";
+	    return "forward:/usermanage.do";
 	} else {
 	    request.setAttribute("roles", service.filterRoles(rolelist, request.isUserInRole(Role.SYSADMIN),
 		    organisation.getOrganisationType()));
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java
===================================================================
diff -u -r912a82fab80bb985823a3d4b6168a9146ed97a7a -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java	(.../UserRolesController.java)	(revision 912a82fab80bb985823a3d4b6168a9146ed97a7a)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java	(.../UserRolesController.java)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -161,6 +161,7 @@
 	    }
 	} else {
 	    errorMap.add("roles", messageService.getMessage("msg.add.to.org", org.getName()));
+	    request.setAttribute("errorMap", errorMap);
 	}
 	userRolesForm.setRoles(roles);
 	return "userrole";
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java
===================================================================
diff -u -r2db2585176c2ec6e2d3c8efd625fb72abc98c619 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java	(.../UserRolesSaveController.java)	(revision 2db2585176c2ec6e2d3c8efd625fb72abc98c619)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java	(.../UserRolesSaveController.java)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -107,7 +107,7 @@
 
 	service.setRolesForUserOrganisation(user, orgId, Arrays.asList(roles));
 
-	return "redirect:/usermanage.do";
+	return "forward:/usermanage.do";
     }
 
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java
===================================================================
diff -u -r2db2585176c2ec6e2d3c8efd625fb72abc98c619 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java	(.../UserSaveController.java)	(revision 2db2585176c2ec6e2d3c8efd625fb72abc98c619)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java	(.../UserSaveController.java)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -232,11 +232,11 @@
 
 	if (errorMap.isEmpty()) {
 	    if ((orgId == null) || (orgId == 0)) {
-		return "redirect:/usersearch.do";
+		return "forward:/usersearch.do";
 	    }
 	    if (edit) {
 		request.setAttribute("org", orgId);
-		return "redirect:/usermanage.do";
+		return "forward:/usermanage.do";
 	    } else {
 		request.setAttribute("orgId", orgId);
 		request.setAttribute("userId", user.getUserId());
Index: lams_admin/web/cleanup.jsp
===================================================================
diff -u -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/cleanup.jsp	(.../cleanup.jsp)	(revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6)
+++ lams_admin/web/cleanup.jsp	(.../cleanup.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -57,7 +57,7 @@
 	<form:form action="start.do" modelAttribute="cleanupForm" id="cleanupForm" method="post">
 	
 		<p><fmt:message key="label.cleanup.delete" />:
-		<form:input type="text" path="numDays" maxlength="4" size="4" cssClass="form-control form-control-inline" /></p>
+		<form:input path="numDays" maxlength="4" size="4" cssClass="form-control form-control-inline" /></p>
 		
 		<div class="pull-right">
 			<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="admin.cancel" /></a>
Index: lams_admin/web/disabledusers.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/disabledusers.jsp	(.../disabledusers.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/disabledusers.jsp	(.../disabledusers.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -47,7 +47,7 @@
 					<c:out value="${user.lastName}" />
 				</td>
 				<td>
-					<a href="user/enable.do?userId=<c:out value="${user.userId}"/>" class="btn btn-default btn-sm"><fmt:message key="admin.enable"/></a>
+					<a href="<lams:LAMSURL/>admin/user/enable.do?userId=<c:out value="${user.userId}"/>" class="btn btn-default btn-sm"><fmt:message key="admin.enable"/></a>
 				</td>		
 			</tr>
 		</c:forEach>
Index: lams_admin/web/import/importresult.jsp
===================================================================
diff -u -r472fb979e3afdb43a7d537e588c5204554ba9f38 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/import/importresult.jsp	(.../importresult.jsp)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
+++ lams_admin/web/import/importresult.jsp	(.../importresult.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -18,7 +18,7 @@
 	<lams:Page type="admin" title="${title}">
 		<p><a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-		<p><c:out value="${successful}"/></p>
+		<p><fmt:message key="${successful}"/></p>
 		<p>
 		<c:forEach items="${results}" var="messages" varStatus="index">
 			<c:if test="${not empty messages}">
Index: lams_admin/web/lti/ltiConsumerList.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/lti/ltiConsumerList.jsp	(.../ltiConsumerList.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/lti/ltiConsumerList.jsp	(.../ltiConsumerList.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -59,18 +59,18 @@
 								&nbsp;
 								<c:choose>
 									<c:when test="${ltiConsumer.disabled}">
-										<a href="../ltiConsumerManagement/disable.do?disable=false&sid=<c:out value='${ltiConsumer.sid}' />">
+										<a href="<lams:LAMSURL/>admin/ltiConsumerManagement/disable.do?disable=false&sid=<c:out value='${ltiConsumer.sid}' />">
 											<fmt:message key="admin.enable" />
 										</a>
 									</c:when>
 									<c:otherwise>
-										<a href="../ltiConsumerManagement/disable.do?disable=true&sid=<c:out value='${ltiConsumer.sid}' />">
+										<a href="<lams:LAMSURL/>admin/ltiConsumerManagement/disable.do?disable=true&sid=<c:out value='${ltiConsumer.sid}' />">
 											<fmt:message key="admin.disable" />
 										</a>
 									</c:otherwise>
 								</c:choose>
 								&nbsp;
-								<a href="../ltiConsumerManagement/delete.do?sid=<c:out value='${ltiConsumer.sid}' />">
+								<a href="<lams:LAMSURL/>admin/ltiConsumerManagement/delete.do?sid=<c:out value='${ltiConsumer.sid}' />">
 									<fmt:message key="admin.delete" />
 								</a>
 							</td>
Index: lams_admin/web/orgPasswordChange.jsp
===================================================================
diff -u -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6)
+++ lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -126,7 +126,7 @@
 					return;
 				}
 				$.ajax({
-					'url' : '../orgPasswordChange/generatePassword.do'
+					'url' : '<lams:LAMSURL/>admin/orgPasswordChange/generatePassword.do'
 				}).done(function(password){
 					container.find('.pass').val(password);
 				});
@@ -191,7 +191,7 @@
 				}
 			});
 	
-			var jqGridURL = "../orgPasswordChange/getGridUsers.do?organisationID=<c:out value='${orgPasswordChangeForm.organisationID}' />&role=",
+			var jqGridURL = "<lams:LAMSURL/>admin/orgPasswordChange/getGridUsers.do?organisationID=<c:out value='${orgPasswordChangeForm.organisationID}' />&role=",
 				jqGridSettings = {
 					datatype		   : "json",
 				    height			   : "100%",
Index: lams_admin/web/organisation/cloneResult.jsp
===================================================================
diff -u -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/organisation/cloneResult.jsp	(.../cloneResult.jsp)	(revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6)
+++ lams_admin/web/organisation/cloneResult.jsp	(.../cloneResult.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -21,13 +21,13 @@
 
 	<lams:Page type="admin" title="${title}">
 	
-		<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a> :
+		<p><a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a> :
 			<c:if test="${org.organisationType.organisationTypeId eq classTypeId}">
-				<a href="orgmanage.do?org=<c:out value="${org.parentOrganisation.organisationId}" />" class="btn btn-default">
+				<a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${org.parentOrganisation.organisationId}" />" class="btn btn-default">
 				<c:out value="${org.parentOrganisation.name}" />
 				</a> :
 				</c:if>
-				<a href="orgmanage.do?org=<c:out value="${org.organisationId}" />" class="btn btn-default">
+				<a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${org.organisationId}" />" class="btn btn-default">
 					<c:out value="${org.name}" />
 				</a>
 		</p>
@@ -47,7 +47,7 @@
 		</p>
 				
 		<input type="button" class="btn btn-default pull-right" value="<fmt:message key="label.return.to.group" />" 
-		onclick="document.location='orgmanage.do?org=<c:out value="${org.organisationId}" />';"	>
+		onclick="document.location='<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${org.organisationId}" />';"	>
 		
 	</lams:Page>
 	
Index: lams_admin/web/organisation/cloneStart.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/organisation/cloneStart.jsp	(.../cloneStart.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/organisation/cloneStart.jsp	(.../cloneStart.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -136,14 +136,14 @@
 
 	<lams:Page type="admin" title="${title}" formID="cloneForm">
 			
-			<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a> :
+			<p><a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a> :
 				<c:set var="classTypeId"><%= OrganisationType.CLASS_TYPE %></c:set>
 				<c:if test="${org.organisationType.organisationTypeId eq classTypeId}">
-					<a href="orgmanage.do?org=<c:out value="${org.parentOrganisation.organisationId}" />" class="btn btn-default">
+					<a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${org.parentOrganisation.organisationId}" />" class="btn btn-default">
 						<c:out value="${org.parentOrganisation.name}" />
 					</a> :
 				</c:if>
-				<a href="orgmanage.do?org=<c:out value="${org.organisationId}" />" class="btn btn-default">
+				<a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${org.organisationId}" />" class="btn btn-default">
 					<c:out value="${org.name}" />
 				</a>
 			</p>
Index: lams_admin/web/organisation/createOrEdit.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -23,7 +23,7 @@
 				if (${not empty courseToDeleteLessons}) {
 					// confirm redirect to "delete all lessons" page
 					if (confirm('<fmt:message key="msg.delete.organisation.delete.lessons.confirm"/>')) {
-						document.location.href = '../organisation/deleteAllLessonsInit.do?orgId=${courseToDeleteLessons}';
+						document.location.href = '<lams:LAMSURL/>admin/organisation/deleteAllLessonsInit.do?orgId=${courseToDeleteLessons}';
 					}
 					return false;
 				}
@@ -45,13 +45,13 @@
 				<form:hidden path="parentId" />
 				<form:hidden path="typeId" />
 				
-				<p><a href="../orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+				<p><a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
 					<c:if test="${organisationForm.typeId == 3}">
-						: <a href="../orgmanage.do?org=<c:out value="${organisationForm.parentId}" />" class="btn btn-default"><c:out value="${organisationForm.parentName}"/></a>
+						: <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${organisationForm.parentId}" />" class="btn btn-default"><c:out value="${organisationForm.parentName}"/></a>
 					</c:if>
 					
 					<c:if test="${not empty organisationForm.orgId}">
-						: <a href="../orgmanage.do?org=<c:out value="${organisationForm.orgId}" />" class="btn btn-default"><c:out value="${organisationForm.name}"/></a>
+						: <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${organisationForm.orgId}" />" class="btn btn-default"><c:out value="${organisationForm.name}"/></a>
 					</c:if>
 				</p>
 				
Index: lams_admin/web/organisation/deleteAllLessons.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/organisation/deleteAllLessons.jsp	(.../deleteAllLessons.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/organisation/deleteAllLessons.jsp	(.../deleteAllLessons.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -47,7 +47,7 @@
 		}
 		$.ajax({
 			'cache'   : false,
-			'url'     : '<lams:WebAppURL />organisation/deleteAllLessons.do',
+			'url'     : '<lams:LAMSURL/>admin/organisation/deleteAllLessons.do',
 			'data'    : {
 				'limit'  : 5,
 				'orgId'  : ${param.orgId}
@@ -76,8 +76,8 @@
 
 	<lams:Page type="admin" title="${title}">
 				<p>
-					<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-					:  <a href="orgmanage.do?org=${param.orgId}" class="btn btn-default"><c:out value="${courseName}" /></a>
+					<a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+					:  <a href="<lams:LAMSURL/>admin/orgmanage.do?org=${param.orgId}" class="btn btn-default"><c:out value="${courseName}" /></a>
 				</p>
 				
 				<%-- Error Messages --%>
Index: lams_admin/web/organisation/list.jsp
===================================================================
diff -u -rc9e22b65129fe7561d7e66f5d6338557b0f3236a -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
+++ lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -159,7 +159,7 @@
 		</c:if>
 			
 		<c:if test="${orgManageForm.type == 2}">
-				<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a></p>
+				<p><a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a></p>
 			
 				<div class="panel panel-default voffset5" >
 					<div class="panel-heading">
@@ -245,8 +245,8 @@
 			
 		<c:if test="${orgManageForm.type == 3}">
 				<p>
-					<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-					: <a href="orgmanage.do?org=<c:out value="${parentGroupId}"/>" class="btn btn-default"><c:out value="${parentGroupName}"/></a>
+					<a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+					: <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${parentGroupId}"/>" class="btn btn-default"><c:out value="${parentGroupName}"/></a>
 				</p>
 				
 				<div class="panel panel-default voffset5" >
Index: lams_admin/web/remove.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/remove.jsp	(.../remove.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/remove.jsp	(.../remove.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -19,10 +19,10 @@
 		<form>
 
 				<c:if test="${empty orgId}">
-					<c:url var="cancel" value="../usersearch.do" />
+					<c:url var="cancel" value="usersearch.do" />
 				</c:if>
 				<c:if test="${not empty orgId}">
-					<c:url var="cancel" value="../usermanage.do">
+					<c:url var="cancel" value="usermanage.do">
 						<c:param name="org" value="${orgId}" />
 					</c:url>
 				</c:if>
@@ -41,7 +41,7 @@
 								<fmt:message key="msg.disable.user.3"/><br />
 								<fmt:message key="msg.disable.user.4"/>
 							</p>
-							<c:url var="disableaction" value="../user/disable.do">
+							<c:url var="disableaction" value="user/disable.do">
 								<c:param name="userId" value="${userId}" />
 								<c:param name="orgId" value="${orgId}" />
 							</c:url>
@@ -62,7 +62,7 @@
 						</div>
 						<div class="panel-body">     
 							<p><fmt:message key="msg.delete.user.1"/>&nbsp;&nbsp;<fmt:message key="msg.delete.user.2"/></p>
-							<c:url var="deleteaction" value="../user/delete.do">
+							<c:url var="deleteaction" value="user/delete.do">
 									<c:param name="userId" value="${userId}" />
 									<c:param name="orgId" value="${orgId}" />
 								</c:url>
Index: lams_admin/web/serverlist.jsp
===================================================================
diff -u -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/serverlist.jsp	(.../serverlist.jsp)	(revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6)
+++ lams_admin/web/serverlist.jsp	(.../serverlist.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -46,18 +46,18 @@
 						</c:choose>
 					</td>
 					<td>
-						<a id="edit_<c:out value='${server.serverid}'/>" href="servermaintain/edit.do?sid=${server.sid}"><fmt:message key="admin.edit" /></a>
+						<a id="edit_<c:out value='${server.serverid}'/>" href="<lams:LAMSURL/>admin/servermaintain/edit.do?sid=${server.sid}"><fmt:message key="admin.edit" /></a>
 						&nbsp;
 						<c:choose>
 							<c:when test="${server.disabled}">
-								<a id="enable_<c:out value='${server.serverid}'/>" href="servermaintain/enable.do?sid=${server.sid}"><fmt:message key="admin.enable" /></a>
+								<a id="enable_<c:out value='${server.serverid}'/>" href="<lams:LAMSURL/>admin/servermaintain/enable.do?sid=${server.sid}"><fmt:message key="admin.enable" /></a>
 							</c:when>
 							<c:otherwise>
-								<a id="disable_<c:out value='${server.serverid}'/>" href="servermaintain/disable.do?sid=${server.sid}"><fmt:message key="admin.disable" /></a>
+								<a id="disable_<c:out value='${server.serverid}'/>" href="<lams:LAMSURL/>admin/servermaintain/disable.do?sid=${server.sid}"><fmt:message key="admin.disable" /></a>
 							</c:otherwise>
 						</c:choose>
 						&nbsp;
-						<a id="delete_<c:out value='${server.serverid}'/>" href="servermaintain/delete.do?sid=${server.sid}"><fmt:message key="admin.delete" /></a>
+						<a id="delete_<c:out value='${server.serverid}'/>" href="<lams:LAMSURL/>admin/servermaintain/delete.do?sid=${server.sid}"><fmt:message key="admin.delete" /></a>
 					</td>
 				</tr>
 				</c:forEach>
Index: lams_admin/web/signupmanagement/add.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -20,7 +20,7 @@
 	<lams:Page type="admin" title="${title}" formID="signupForm">
 		<div>
 			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a>
-			<a href="../signupManagement/start.do" class="btn btn-default loffset5"><fmt:message key="admin.signup.title" /></a>
+			<a href="<lams:LAMSURL/>admin/signupManagement/start.do" class="btn btn-default loffset5"><fmt:message key="admin.signup.title" /></a>
 			</div>
 			
 			<form:form action="add.do" modelAttribute="signupForm" id="signupForm" method="post">
@@ -107,7 +107,7 @@
 				</table>
 				
 				<div class="pull-right">
-					<a href="../signupManagement/start.do" class="btn btn-default loffset5"><fmt:message key="admin.cancel" /></a>
+					<a href="<lams:LAMSURL/>admin/signupManagement/start.do" class="btn btn-default loffset5"><fmt:message key="admin.cancel" /></a>
 					<input type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
 				</div>
 			
Index: lams_admin/web/signupmanagement/list.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -62,15 +62,15 @@
 						<c:out value="${signupOrganisation.context}" />
 					</td>
 					<td>
-						<a href="../signupManagement/edit.do?soid=${signupOrganisation.signupOrganisationId}"><fmt:message key="admin.edit"/></a>
+						<a href="<lams:LAMSURL/>admin/signupManagement/edit.do?soid=${signupOrganisation.signupOrganisationId}"><fmt:message key="admin.edit"/></a>
 						&nbsp;&nbsp;
-						<a href="../signupManagement/delete.do?soid=${signupOrganisation.signupOrganisationId}"><fmt:message key="admin.delete"/></a>
+						<a href="<lams:LAMSURL/>admin/signupManagement/delete.do?soid=${signupOrganisation.signupOrganisationId}"><fmt:message key="admin.delete"/></a>
 					</td>
 				</tr>
 			</c:forEach>
 		</table>
 		
-		<a href="../signupManagement/add.do" class="btn btn-primary pull-right"><fmt:message key="admin.add.new.signup.page"/></a>
+		<a href="<lams:LAMSURL/>admin/signupManagement/add.do" class="btn btn-primary pull-right"><fmt:message key="admin.add.new.signup.page"/></a>
 
 	</lams:Page>
 
Index: lams_admin/web/timezoneManagement.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -43,7 +43,7 @@
 			<p><a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 			<fmt:message key="admin.timezone.select.timezones.you.want.users.choose" >
 			<fmt:param>
-				<a class="thickbox" href="../timezonemanagement/serverTimezoneManagement.do?KeepThis=true&TB_iframe=true&height=188&width=820" title="<fmt:message key='admin.servertimezone.server.timezone.management'/>">
+				<a class="thickbox" href="<lams:LAMSURL/>admin/timezonemanagement/serverTimezoneManagement.do?KeepThis=true&TB_iframe=true&height=188&width=820" title="<fmt:message key='admin.servertimezone.server.timezone.management'/>">
 					${serverTimezone}
 				</a>
 			</fmt:param>
Index: lams_admin/web/user.jsp
===================================================================
diff -u -rc9e22b65129fe7561d7e66f5d6338557b0f3236a -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+bo<!DOCTYPE html>
 
 <%@ include file="/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
@@ -161,26 +161,26 @@
 				<form:hidden path="userId" />
 
 				<c:if test="${not empty userForm.orgId}">
-					<a href="../orgmanage.do?org=1" class="btn btn-default">
+					<a href="<c:out value="<lams:LAMSURL/>"/>orgmanage.do?org=1" class="btn btn-default">
 						<fmt:message key="admin.course.manage" />
 					</a>
 					<c:if test="${not empty pOrgId}">
-						: <a href="../orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default">
+						: <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default">
 							<c:out value="${parentName}" />
 						  </a>
-						: <a href="../usermanage.do?org=<c:out value="${userForm.orgId}" />" class="btn btn-default">
+						: <a href="<lams:LAMSURL/>admin/usermanage.do?org=<c:out value="${userForm.orgId}" />" class="btn btn-default">
 							<c:out value="${orgName}" />
 						  </a>
 					</c:if>
 					<c:if test="${empty pOrgId}">
-						: <a href="../orgmanage.do?org=<c:out value="${userForm.orgId}" />" class="btn btn-default">
+						: <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${userForm.orgId}" />" class="btn btn-default">
 							<c:out value="${orgName}" />
 						  </a>
 					</c:if>
 				</c:if>
 			
 				<c:if test="${empty userForm.orgId}">
-					<a href="../orgmanage.do?org=1" class="btn btn-default">
+					<a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default">
 						<fmt:message key="admin.course.manage" />
 					</a>
 				</c:if>
Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -61,13 +61,13 @@
 	<lams:Page type="admin" title="${title}">
 				
 			<p>
-				<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+				<a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
 				<c:if test="${orgType == 2}">
-					: <a href="orgmanage.do?org=<c:out value="${userManageForm.orgId}" />" class="btn btn-default"><c:out value="${userManageForm.orgName}" /></a>
+					: <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${userManageForm.orgId}" />" class="btn btn-default"><c:out value="${userManageForm.orgName}" /></a>
 				</c:if>
 				<c:if test="${orgType == 3}">
-					: <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><c:out value="${pOrgName}"/></a>
-					: <a href="orgmanage.do?org=<c:out value="${userManageForm.orgId}" />" class="btn btn-default"><c:out value="${userManageForm.orgName}"/></a>
+					: <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><c:out value="${pOrgName}"/></a>
+					: <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${userManageForm.orgId}" />" class="btn btn-default"><c:out value="${userManageForm.orgName}"/></a>
 				</c:if>
 			</p>
 			
@@ -82,12 +82,12 @@
 						</c:if>
 					</span>
 					<div class="pull-right btn-group btn-group-sm">
-						<input id="addRemoveUsers" class="btn btn-default" type="button" value="<fmt:message key="admin.user.add"/>" onclick="javascript:document.location='userorg.do?orgId=<c:out value="${userManageForm.orgId}"/>'" />
+						<input id="addRemoveUsers" class="btn btn-default" type="button" value="<fmt:message key="admin.user.add"/>" onclick="javascript:document.location='<lams:LAMSURL/>admin/userorg.do?orgId=<c:out value="${userManageForm.orgId}"/>'" />
 						<c:if test="${userManageForm.canResetOrgPassword == true}">
-							<a class="btn btn-default" href="orgPasswordChange/start.do?organisationID=${userManageForm.orgId}"><fmt:message key='admin.org.password.change.button'/></a>
+							<a class="btn btn-default" href="<lams:LAMSURL/>admin/orgPasswordChange/start.do?organisationID=${userManageForm.orgId}"><fmt:message key='admin.org.password.change.button'/></a>
 						</c:if>
 						<c:if test="${userManageForm.courseAdminCanAddNewUsers == true}">
-							<input class="btn btn-default" type="button" value="<fmt:message key="admin.user.create"/>" onclick="javascript:document.location='user/edit.do?orgId=<c:out value="${userManageForm.orgId}"/>'" />
+							<input class="btn btn-default" type="button" value="<fmt:message key="admin.user.create"/>" onclick="javascript:document.location='<lams:LAMSURL/>admin/user/edit.do?orgId=<c:out value="${userManageForm.orgId}"/>'" />
 						</c:if>
 					</div>
 				</div>
@@ -171,14 +171,14 @@
 						    </small>
 						</td>
 						<td>
-								<a href="userroles.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><fmt:message key="admin.user.assign.roles"/></a>
+								<a href="<lams:LAMSURL/>admin/userroles.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><fmt:message key="admin.user.assign.roles"/></a>
 								&nbsp;
 								<c:if test="${userManageForm.courseAdminCanAddNewUsers == true }">
-									<a href="user/edit.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><fmt:message key="admin.edit" /></a>
+									<a href="<lams:LAMSURL/>admin/user/edit.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><fmt:message key="admin.edit" /></a>
 									&nbsp;
 								</c:if>
 								<c:if test="${canDeleteUser == true}">
-									<a href="user/remove.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><fmt:message key="admin.user.delete"/></a>
+									<a href="<lams:LAMSURL/>admin/user/remove.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><fmt:message key="admin.user.delete"/></a>
 								</c:if>
 								<br/>
 						</td>		
Index: lams_admin/web/userorg.jsp
===================================================================
diff -u -rc9e22b65129fe7561d7e66f5d6338557b0f3236a -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
+++ lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -152,16 +152,16 @@
 	<c:set var="title">${title}: <fmt:message key="admin.user.add"/></c:set>
 	<lams:Page type="admin" title="${title}">
 				<p>
-					<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+					<a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
 				    <c:if test="${not empty pOrgId}">
-				        : <a href="orgmanage.do?org=<c:out value="pOrgId" />" class="btn btn-default"><c:out value="${pOrgName}"/></a>
+				        : <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="pOrgId" />" class="btn btn-default"><c:out value="${pOrgName}"/></a>
 				    </c:if>
 				    <c:if test="${userOrgForm.orgId != 1}">
-						: <a href="<c:if test="${orgType == 3}">user</c:if><c:if test="${orgType != 3}">org</c:if>manage.do?org=<c:out value="${userOrgForm.orgId}" />" class="btn btn-default">
+						: <a href="<lams:LAMSURL/>admin/<c:if test="${orgType == 3}">user</c:if><c:if test="${orgType != 3}">org</c:if>manage.do?org=<c:out value="${userOrgForm.orgId}" />" class="btn btn-default">
 						<c:out value="${userOrgForm.orgName}"/></a>
 					</c:if>
 					<c:if test="${userOrgForm.orgId == 1}">
-						: <a href="usermanage.do?org=<c:out value="${userOrgForm.orgId}" />" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
+						: <a href="<lams:LAMSURL/>admin/usermanage.do?org=<c:out value="${userOrgForm.orgId}" />" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
 					</c:if>
 				</p>
 				
@@ -208,7 +208,7 @@
 				<div id="form" class="pull-right">
 					<form:form action="./userorgsave.do" modelAttribute="userOrgForm" id="userOrgForm" method="post">
 						<form:hidden path="orgId" />
-						<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
+						<a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
 						<input type="submit" id="nextButton" class="btn btn-primary loffset5" onclick="return populateForm();" value="<fmt:message key="label.next"/>" />
 					</form:form>
 				</div>
Index: lams_admin/web/userorgrole.jsp
===================================================================
diff -u -r9fc1cf92b1b95489621275ef2aca4c18baf6969e -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision 9fc1cf92b1b95489621275ef2aca4c18baf6969e)
+++ lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -28,16 +28,16 @@
 	<c:set var="title">${title}: <fmt:message key="admin.user.assign.roles"/></c:set>
 	<lams:Page type="admin" title="${title}" formID="userOrgRoleForm">
 		
-		<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+		<p><a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
 	    <c:if test="${not empty pOrgId}">
-	        : <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><c:out value="${pOrgName}"/></a>
+	        : <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><c:out value="${pOrgName}"/></a>
 	    </c:if>
 	    <c:if test="${userOrgRoleForm.orgId != 1}">
-			: <a href="<c:if test="${orgType == 3}">user</c:if><c:if test="${orgType != 3}">org</c:if>manage.do?org=<c:out value="${userOrgRoleForm.orgId}" />" class="btn btn-default">
+			: <a href="<lams:LAMSURL/>admin/<c:if test="${orgType == 3}">user</c:if><c:if test="${orgType != 3}">org</c:if>manage.do?org=<c:out value="${userOrgRoleForm.orgId}" />" class="btn btn-default">
 			<c:out value="${orgName}"/></a>
 		</c:if>
 		<c:if test="${userOrgRoleForm.orgId == 1}">
-			: <a href="usermanage.do?org=<c:out value="${userOrgRoleForm.orgId}" />" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
+			: <a href="<lams:LAMSURL/>admin/usermanage.do?org=<c:out value="${userOrgRoleForm.orgId}" />" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
 		</c:if>
 		</h4>
 		
@@ -66,7 +66,7 @@
 				</td>
 				<c:forEach var="role" items="${roles}">
 					<td>
-						<input type="checkbox" id="${userBean.login}Role${role.roleId}" name="userBeans[${beanIndex.index}].roleId" value="${role.roleId}" />&nbsp;
+						<input type="checkbox" id="${userBean.login}Role${role.roleId}" name="userBeans[${beanIndex.index}].roleIds" value="${role.roleId}" />&nbsp;
 					</td>
 				</c:forEach>
 			</tr>
@@ -77,7 +77,7 @@
 		</c:if>
 		
 		<div class="pull-right">
-			<a href="usermanage.do?org=1" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
+			<a href="<lams:LAMSURL/>admin/usermanage.do?org=1" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
 			<input type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save"/>" />
 		</div>
 		</form:form>
Index: lams_admin/web/userrole.jsp
===================================================================
diff -u -r2db2585176c2ec6e2d3c8efd625fb72abc98c619 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision 2db2585176c2ec6e2d3c8efd625fb72abc98c619)
+++ lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -23,17 +23,17 @@
 		<form:hidden path="userId" />
 		
 		<p>
-			<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+			<a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
 			<c:if test="${not empty pOrgId}">
-				: <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><c:out value="${parentName}" /></a>
-				: <a href="usermanage.do?org=<c:out value="${userRolesForm.orgId}" />" class="btn btn-default"><c:out value="${orgName}" /></a>
+				: <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><c:out value="${parentName}" /></a>
+				: <a href="<lams:LAMSURL/>admin/usermanage.do?org=<c:out value="${userRolesForm.orgId}" />" class="btn btn-default"><c:out value="${orgName}" /></a>
 			</c:if>
 			<c:if test="${empty pOrgId}">
 				<c:if test="${userRolesForm.orgId != 1}">
-					: <a href="orgmanage.do?org=<c:out value="${userRolesForm.orgId}" />" class="btn btn-default"><c:out value="${orgName}" /></a>
+					: <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${userRolesForm.orgId}" />" class="btn btn-default"><c:out value="${orgName}" /></a>
 				</c:if>
 				<c:if test="${userRolesForm.orgId == 1}">
-					: <a href="usermanage.do?org=<c:out value="${userRolesForm.orgId}" />" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
+					: <a href="<lams:LAMSURL/>admin/usermanage.do?org=<c:out value="${userRolesForm.orgId}" />" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
 				</c:if>
 			</c:if>
 		</p>
@@ -82,7 +82,7 @@
 		</div>
 		
 		<div class="pull-right">
-			<a href="usermanage.do?org=1" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
+			<a href="<lams:LAMSURL/>admin/usermanage.do?org=1" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
 			<input type="reset" class="btn btn-default" value="<fmt:message key="admin.reset" />" />
 			<input type="submit" name="submitbutton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
 		</div>
Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
@@ -93,21 +93,21 @@
 								rows += '</td>';
 								
 								rows += '<td>';
-								rows += 	'[<a href="user/edit.do?userId=' + orgData["userId"] + '">';
+								rows += 	'[<a href="<lams:LAMSURL/>admin/user/edit.do?userId=' + orgData["userId"] + '">';
 								rows += 		'<fmt:message key="admin.edit"/>';
 								rows += 	'</a>]';
 								rows += 	'&nbsp;';
-								rows += 	'[<a href="user/remove.do?userId=' + orgData["userId"] + '">';
+								rows += 	'[<a href="<lams:LAMSURL/>admin/user/remove.do?userId=' + orgData["userId"] + '">';
 								rows += 		'<fmt:message key="admin.user.delete"/>';
 								rows += 	'</a>]';
 								rows += 	'&nbsp;';
-								rows += 	'[<a href="<lams:LAMSURL/>/loginas.do?login=' + orgData["login"] + '">';
+								rows += 	'[<a href="loginas.do?login=' + orgData["login"] + '">';
 								rows += 		'<fmt:message key="label.login.as"/>';
 								rows += 	'</a>]';
 								rows += 	'&nbsp;';
 	
 								if (${(useInternalSMTPServer || not empty smtpServer)} && orgData["email"] != null && orgData["email"] != "") {
-								rows += 	'[<a href="<lams:LAMSURL/>emailUser.do?method=composeMail&returnUrl=admin/usersearch.do&userID=' + orgData["userId"] + '">';
+								rows += 	'[<a href="<lams:LAMSURL/>emailUser/composeMail.do?returnUrl=admin/usersearch.do&userID=' + orgData["userId"] + '">';
 								rows += 		'<fmt:message key="label.email"/>';
 								rows += 	'</a>]';
 								}
@@ -147,7 +147,7 @@
 <body class="stripes">
 
 	<lams:Page type="admin" title="${title}">
-		<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+		<p><a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
 		<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default loffset5"><fmt:message key="sysadmin.maintain" /></a></p>
 		
 		<p><input class="btn btn-default" type="button" value="<fmt:message key="admin.user.create"/>" onclick="javascript:document.location='user/edit.do'" />
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7525e7b5fda723cc9c2c81a78cd8be3785bad851
Binary files differ