Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java =================================================================== diff -u -r29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5 -rc23b02b0993f938043a9148594539e8af88b807f --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java (.../UserSaveController.java) (revision 29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java (.../UserSaveController.java) (revision c23b02b0993f938043a9148594539e8af88b807f) @@ -251,21 +251,17 @@ if (errorMap.isEmpty()) { if ((orgId == null) || (orgId == 1)) { - return "forward:/usersearch.do"; + return "redirect:/usersearch.do"; } if (!edit && !canEditRole) { // Course Admin created new learner userManagementService.setRolesForUserOrganisation(user, orgId, Arrays.asList(Role.ROLE_LEARNER.toString())); - request.setAttribute("org", orgId); - return "forward:/usermanage.do"; + return "redirect:/usermanage.do?org=" + orgId; } else if (edit) { - request.setAttribute("org", orgId); - return "forward:/usermanage.do"; + return "redirect:/usermanage.do?org=" + orgId; } else { - request.setAttribute("orgId", orgId); - request.setAttribute("userId", user.getUserId()); - return "forward:/userroles.do"; + return "redirect:/userroles.do?orgId=" + orgId + "&userId=" + user.getUserId(); } } else { request.setAttribute("orgId", orgId);