Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java
===================================================================
diff -u -r6a628ebf2827a9cc512616271f838549273c4e1f -r15e10e04c8ed121dcf87859d994bc2a3f96cfac7
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java	(.../UserManageAction.java)	(revision 6a628ebf2827a9cc512616271f838549273c4e1f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java	(.../UserManageAction.java)	(revision 15e10e04c8ed121dcf87859d994bc2a3f96cfac7)
@@ -119,7 +119,8 @@
 		}
 		
 		// get list of users in org
-		List<User> users = getService().getUsersFromOrganisation(orgId);
+		List users = getService().getUsersFromOrganisation(orgId);
+		Collections.sort(users);
 		if(users==null){
 			errors.add("org",new ActionMessage("error.org.invalid"));
 			saveErrors(request,errors);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java
===================================================================
diff -u -r6a628ebf2827a9cc512616271f838549273c4e1f -r15e10e04c8ed121dcf87859d994bc2a3f96cfac7
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java	(.../UserOrgAction.java)	(revision 6a628ebf2827a9cc512616271f838549273c4e1f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java	(.../UserOrgAction.java)	(revision 15e10e04c8ed121dcf87859d994bc2a3f96cfac7)
@@ -25,6 +25,7 @@
 package org.lamsfoundation.lams.admin.web;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -97,7 +98,7 @@
 				
 		// get list of users in org
 		User user = (User)getService().getUserByLogin(request.getRemoteUser());
-		List<User> users = new ArrayList<User>();
+		List users = new ArrayList<User>();
 		Organisation orgOfCourseAdmin = (orgType.equals(OrganisationType.CLASS_TYPE)) ? parentOrg : organisation;
 		if(request.isUserInRole(Role.SYSADMIN)){
 			users = getService().findAll(User.class);
@@ -116,6 +117,7 @@
 				return mapping.findForward("error");
 			}
 		}
+		Collections.sort(users);
 		request.setAttribute("userlist",users);
 		
 		// create form object