Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java
===================================================================
diff -u -rc9e22b65129fe7561d7e66f5d6338557b0f3236a -r9fc1cf92b1b95489621275ef2aca4c18baf6969e
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java	(.../OrgSaveController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java	(.../OrgSaveController.java)	(revision 9fc1cf92b1b95489621275ef2aca4c18baf6969e)
@@ -153,7 +153,7 @@
 	    org = service.saveOrganisation(org, user.getUserID());
 
 	    request.setAttribute("org", organisationForm.getParentId());
-	    return "redirect:/orgmanage.do";
+	    return "forward:/orgmanage.do";
 	} else {
 	    request.setAttribute("errorMap", errorMap);
 	    return "redirect:/organisation/edit.do";
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java
===================================================================
diff -u -rc9e22b65129fe7561d7e66f5d6338557b0f3236a -r9fc1cf92b1b95489621275ef2aca4c18baf6969e
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java	(.../UserOrgRoleController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java	(.../UserOrgRoleController.java)	(revision 9fc1cf92b1b95489621275ef2aca4c18baf6969e)
@@ -40,11 +40,11 @@
 import org.lamsfoundation.lams.usermanagement.UserOrganisation;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 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;
 
 /**
@@ -65,6 +65,7 @@
  *
  */
 @Controller
+@Scope("session")
 public class UserOrgRoleController {
 
     private static Logger log = Logger.getLogger(UserOrgRoleController.class);
@@ -73,10 +74,9 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @SuppressWarnings("unchecked")
     @RequestMapping(path = "/userorgrole")
-    public String execute(@ModelAttribute UserOrgRoleForm userOrgRoleForm, BindingResult result, HttpServletRequest request)
-	    throws Exception {
+    public String execute(@ModelAttribute UserOrgRoleForm userOrgRoleForm, BindingResult result,
+	    HttpServletRequest request) throws Exception {
 
 	service = AdminServiceProxy.getService(applicationContext.getServletContext());
 	// make sure we don't have left overs from any previous attempt
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java
===================================================================
diff -u -rc9e22b65129fe7561d7e66f5d6338557b0f3236a -r9fc1cf92b1b95489621275ef2aca4c18baf6969e
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java	(.../UserOrgRoleSaveController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java	(.../UserOrgRoleSaveController.java)	(revision 9fc1cf92b1b95489621275ef2aca4c18baf6969e)
@@ -37,6 +37,7 @@
 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;
@@ -66,6 +67,7 @@
  *
  */
 @Controller
+@Scope("session")
 public class UserOrgRoleSaveController {
 
     private static Logger log = Logger.getLogger(UserOrgRoleSaveController.class);
Index: lams_admin/web/userorgrole.jsp
===================================================================
diff -u -r56a5fc1584a958c1b12ba75326f9bebb9a952baf -r9fc1cf92b1b95489621275ef2aca4c18baf6969e
--- lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision 56a5fc1584a958c1b12ba75326f9bebb9a952baf)
+++ lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision 9fc1cf92b1b95489621275ef2aca4c18baf6969e)
@@ -46,7 +46,7 @@
 		<p><fmt:message key="msg.roles.mandatory.users"/></p>
 		
 		<form:form action="userorgrolesave.do" modelAttribute="userOrgRoleForm" id="userOrgRoleForm" method="post">
-		<input type="hidden" name="orgId" />
+		<form:hidden path="orgId" />
 		
 		<table class="table table-condensed table-no-border">
 		<tr>