Index: lams_admin/src/java/org/lamsfoundation/lams/admin/util/AdminPreparer.java
===================================================================
diff -u -rde1940e60766f8901436c6ab567c692685d5b35c -rcd9d55dae3d4dccf372f4d7a906c5ce43dac1aac
--- lams_admin/src/java/org/lamsfoundation/lams/admin/util/AdminPreparer.java	(.../AdminPreparer.java)	(revision de1940e60766f8901436c6ab567c692685d5b35c)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/util/AdminPreparer.java	(.../AdminPreparer.java)	(revision cd9d55dae3d4dccf372f4d7a906c5ce43dac1aac)
@@ -28,11 +28,15 @@
 import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 
+import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
+import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
@@ -46,28 +50,36 @@
  */
 public class AdminPreparer {
 
+	private static Logger log = Logger.getLogger(AdminPreparer.class);
+
 	public static void prepare(Organisation org, HttpServletRequest request, UserManagementService service){
 		UserOrganisationRole userOrgRole = null;
-		if(org.getParentOrganisation()!=null){
-			userOrgRole = service.getUserOrganisationRole(request.getRemoteUser(),org.getParentOrganisation().getOrganisationId(),Role.ADMIN);	
-		}
-		List childOrgs = service.getChildOrganisations(org);
-		for(int i=0; i<childOrgs.size();i++){
-			Organisation childOrg = (Organisation)childOrgs.get(i);
-			if(service.getUserOrganisationRole(request.getRemoteUser(),childOrg.getOrganisationId(),Role.ADMIN)==null){
-				childOrgs.remove(i);
+		HttpSession ss = SessionManager.getSession();
+		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		if ( user == null ) {
+			log.error("Unable to prepare for admin as user is not in the shared session");
+		} else {
+			if(org.getParentOrganisation()!=null){
+				userOrgRole = service.getUserOrganisationRole(user.getUserID(),org.getParentOrganisation().getOrganisationId(),Role.ADMIN);	
 			}
+			List childOrgs = service.getChildOrganisations(org);
+			for(int i=0; i<childOrgs.size();i++){
+				Organisation childOrg = (Organisation)childOrgs.get(i);
+				if(service.getUserOrganisationRole(user.getUserID(),childOrg.getOrganisationId(),Role.ADMIN)==null){
+					childOrgs.remove(i);
+				}
+			}
+			if(childOrgs.size()!=0){
+				Set childOrganisations = new HashSet();
+				childOrganisations.addAll(childOrgs);
+				org.setChildOrganisations(childOrganisations);
+			}else{
+				org.setChildOrganisations(null);
+			}
+			request.setAttribute(AttributeNames.ADMIN_ORGANISATION,org);
+			if(userOrgRole!=null){
+				request.setAttribute(AttributeNames.ADMIN_PARENT_ACCESS,"true");
+			}
 		}
-		if(childOrgs.size()!=0){
-			Set childOrganisations = new HashSet();
-			childOrganisations.addAll(childOrgs);
-			org.setChildOrganisations(childOrganisations);
-		}else{
-			org.setChildOrganisations(null);
-		}
-		request.setAttribute(AttributeNames.ADMIN_ORGANISATION,org);
-		if(userOrgRole!=null){
-			request.setAttribute(AttributeNames.ADMIN_PARENT_ACCESS,"true");
-		}
 	}
 }