Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java
===================================================================
diff -u -r7525e7b5fda723cc9c2c81a78cd8be3785bad851 -rd11fc4c9bde6900c905c40030cb0f0c0ef659e9a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java	(.../UserOrgRoleSaveController.java)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java	(.../UserOrgRoleSaveController.java)	(revision d11fc4c9bde6900c905c40030cb0f0c0ef659e9a)
@@ -118,7 +118,7 @@
 	    //	}
 	    //}
 	}
-	return "forward:/usermanage.do";
+	return "redirect:/usermanage.do?org=" + orgId;
     }
 
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java
===================================================================
diff -u -r7525e7b5fda723cc9c2c81a78cd8be3785bad851 -rd11fc4c9bde6900c905c40030cb0f0c0ef659e9a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java	(.../UserOrgSaveController.java)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java	(.../UserOrgSaveController.java)	(revision d11fc4c9bde6900c905c40030cb0f0c0ef659e9a)
@@ -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 "forward:/usermanage.do";
+	    return "redirect:/usermanage.do?org=" + orgId;
 	} else {
 	    request.setAttribute("roles", service.filterRoles(rolelist, request.isUserInRole(Role.SYSADMIN),
 		    organisation.getOrganisationType()));
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java
===================================================================
diff -u -r7525e7b5fda723cc9c2c81a78cd8be3785bad851 -rd11fc4c9bde6900c905c40030cb0f0c0ef659e9a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java	(.../UserRolesSaveController.java)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java	(.../UserRolesSaveController.java)	(revision d11fc4c9bde6900c905c40030cb0f0c0ef659e9a)
@@ -107,7 +107,7 @@
 
 	service.setRolesForUserOrganisation(user, orgId, Arrays.asList(roles));
 
-	return "forward:/usermanage.do";
+	return "redirect:/usermanage.do?org=" + orgId;
     }
 
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java
===================================================================
diff -u -r7525e7b5fda723cc9c2c81a78cd8be3785bad851 -rd11fc4c9bde6900c905c40030cb0f0c0ef659e9a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java	(.../UserSaveController.java)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java	(.../UserSaveController.java)	(revision d11fc4c9bde6900c905c40030cb0f0c0ef659e9a)
@@ -114,8 +114,7 @@
 	    if ((orgId == null) || (orgId == 0)) {
 		return "redirect:../usersearch.do";
 	    }
-	    request.setAttribute("org", orgId);
-	    return "redirect:../usermanage.do";
+	    return "redirect:../usermanage.do?org" + orgId;
 	}
 
 	User user = null;
Index: lams_admin/web/user.jsp
===================================================================
diff -u -r7525e7b5fda723cc9c2c81a78cd8be3785bad851 -rd11fc4c9bde6900c905c40030cb0f0c0ef659e9a
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision d11fc4c9bde6900c905c40030cb0f0c0ef659e9a)
@@ -161,7 +161,7 @@
 				<form:hidden path="userId" />
 
 				<c:if test="${not empty userForm.orgId}">
-					<a href="<c:out value="<lams:LAMSURL/>"/>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 test="${not empty pOrgId}">
@@ -465,7 +465,7 @@
 									<fmt:message key="label.theme" />:
 								</td>
 								<td>
-									<form:select path="userTheme" styleClass="form-control">
+									<form:select path="userTheme" class="form-control">
 										<c:forEach items="${themes}" var="theme">
 											<form:option value="${theme.themeId}">${theme.name}</form:option>
 										</c:forEach>
Index: lams_admin/web/userrole.jsp
===================================================================
diff -u -r7525e7b5fda723cc9c2c81a78cd8be3785bad851 -rd11fc4c9bde6900c905c40030cb0f0c0ef659e9a
--- lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851)
+++ lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision d11fc4c9bde6900c905c40030cb0f0c0ef659e9a)
@@ -18,7 +18,7 @@
 	<c:set var="title">${title}: <fmt:message key="admin.user.assign.roles"/></c:set>
 	<lams:Page type="admin" title="${title}" formID="userRolesForm">
 	
-		<form:form action="userrolessave.do" modelAttribute="userRolesForm" id="userRolesForm" method="post">
+		<form:form action="/lams/admin/userrolessave.do" modelAttribute="userRolesForm" id="userRolesForm" method="post">
 		<form:hidden path="orgId" />
 		<form:hidden path="userId" />
 		
@@ -74,15 +74,21 @@
 		  <div class="col-xs-2"><fmt:message key="admin.user.roles"/>:</div>
 		  <div class="col-xs-10">            
 		  	<c:forEach items="${rolelist}" var="role" varStatus="index">
-		    	<input type="checkbox" name="${userRolesForm.roles}" value="${role.roleId}"/>
+		    	<input type="checkbox" name="roles" value="${role.roleId}" 
+		    	<c:forEach items="${userRolesForm.roles}" var="userRole">
+		    		<c:if test="${userRole == role.roleId}">
+		    			checked="checked"
+		    		</c:if>
+		    	</c:forEach>
+		    	/>
 		        <fmt:message>role.<lams:role role="${role.name}" /></fmt:message><br/>
 		    </c:forEach>
 		  </div>
 		</div>
 		</div>
 		
 		<div class="pull-right">
-			<a href="<lams:LAMSURL/>admin/usermanage.do?org=1" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
+			<a href="<lams:LAMSURL/>admin/usermanage.do?org=<c:out value="${userRolesForm.orgId}" />" 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_central/src/java/org/lamsfoundation/lams/web/LoginAsController.java
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -rd11fc4c9bde6900c905c40030cb0f0c0ef659e9a
--- lams_central/src/java/org/lamsfoundation/lams/web/LoginAsController.java	(.../LoginAsController.java)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/LoginAsController.java	(.../LoginAsController.java)	(revision d11fc4c9bde6900c905c40030cb0f0c0ef659e9a)
@@ -105,7 +105,8 @@
 		    // notify the login module that the user has been authenticated correctly
 		    UniversalLoginModule.setAuthenticationToken(token);
 		    // redirect to login page
-		    return "redirect:login.jsp?redirectURL=/lams/index";
+		    request.setAttribute("redirectURL", "/lams/index.jsp");
+		    return "login";
 		}
 	    }
 	} else {
Index: lams_central/web/login.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd11fc4c9bde6900c905c40030cb0f0c0ef659e9a
--- lams_central/web/login.jsp	(.../login.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/login.jsp	(.../login.jsp)	(revision d11fc4c9bde6900c905c40030cb0f0c0ef659e9a)
@@ -107,11 +107,12 @@
 						</c:if>
 
 						<form action="/lams/j_security_check" method="POST" name="loginForm" role="form" class="form-horizontal" id="loginForm" autocomplete="off">
-						  <input type="hidden" name="redirectURL" value='<c:out value="${param.redirectURL}" escapeXml="true" />' />
-              <div class="input-group">
+							<input type="hidden" name="redirectURL" value='<c:out value="${param.redirectURL}" 
+						  		 escapeXml="true" />' />
+             				 <div class="input-group">
 								<span class="input-group-addon"><i class="fa fa-user"></i></span>
 								<input id="j_username" type="text" class="form-control" autocapitalize="off" name="j_username" value="" placeholder="<fmt:message key='label.username' />" onkeypress="onEnter(event)" tabindex="1">
-              </div>
+              				</div>
 
 							<div class="input-group voffset5">
 								<span class="input-group-addon"><i class="fa fa-lock"></i></span>
@@ -169,7 +170,7 @@
 				<form style="display: none" method="POST" action="j_security_check">
 					<input type="hidden" name="j_username" value="${login}" /> <input type="hidden" name="j_password"
 						value="${password}" /> <input type="hidden" name="redirectURL"
-						value='<c:out value="${param.redirectURL}" escapeXml="true" />' />
+						value='<c:out value="${empty param.redirectURL ? redirectURL : param.redirectURL}" escapeXml="true" />' />
 				</form>
 				<div id="footer"></div>
 			</lams:Page>