Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java,v
diff -u -r1.10 -r1.11
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	27 Jun 2006 07:25:05 -0000	1.10
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	28 Jun 2006 23:43:46 -0000	1.11
@@ -100,13 +100,15 @@
 			
 			// get system's roles
 			List allRoles = service.findAll(Role.class);
-			ArrayList<RoleDTO> rolelist = new ArrayList<RoleDTO>();
+			/*ArrayList<RoleDTO> rolelist = new ArrayList<RoleDTO>();
 			for(int i=0; i<allRoles.size(); i++){
 				Role r = (Role)allRoles.get(i);
 			    rolelist.add(new RoleDTO(r));
 			}
 			Collections.sort(rolelist);
-			request.setAttribute("rolelist",rolelist);
+			request.setAttribute("rolelist",rolelist);*/
+			Collections.sort(allRoles);
+			request.setAttribute("rolelist",allRoles);
 			
 			// get user's roles
 			Iterator iter = user.getUserOrganisations().iterator();
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java,v
diff -u -r1.5 -r1.6
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java	27 Jun 2006 07:25:05 -0000	1.5
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java	28 Jun 2006 23:43:46 -0000	1.6
@@ -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;
@@ -123,6 +124,7 @@
 			List roles;
 			try{
 				roles = service.getRolesForUserByOrganisation(user, orgId);
+				Collections.sort(roles);
 			} catch(NullPointerException e){
 				roles = new ArrayList();
 				log.debug("no roles found for user: "+user);