Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerListAction.java
===================================================================
diff -u -r6ed3a2d80b1f6bb914d36fce3f5a5c0225e2c976 -r9335a453f7ca971051430105a3462fb587931363
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerListAction.java	(.../ServerListAction.java)	(revision 6ed3a2d80b1f6bb914d36fce3f5a5c0225e2c976)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerListAction.java	(.../ServerListAction.java)	(revision 9335a453f7ca971051430105a3462fb587931363)
@@ -22,13 +22,17 @@
  */
 package org.lamsfoundation.lams.admin.web;
 
+import java.util.Collections;
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.integration.ExtServerOrgMap;
 import org.lamsfoundation.lams.integration.service.IIntegrationService;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -52,11 +56,14 @@
 	
 	private static IIntegrationService service;
 	
+	@SuppressWarnings("unchecked")
 	public ActionForward execute(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
             HttpServletResponse response) throws Exception{
-		request.setAttribute("servers", getService().getAllExtServerOrgMaps());
+		List<ExtServerOrgMap> list = getService().getAllExtServerOrgMaps();
+		Collections.sort(list);
+		request.setAttribute("servers", list);
 		return mapping.findForward("serverlist");
 	}
 	
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java
===================================================================
diff -u -r0d99e8a46419e9ab8c44716a682537f578c4d9b8 -r9335a453f7ca971051430105a3462fb587931363
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java	(.../ServerMaintainAction.java)	(revision 0d99e8a46419e9ab8c44716a682537f578c4d9b8)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java	(.../ServerMaintainAction.java)	(revision 9335a453f7ca971051430105a3462fb587931363)
@@ -23,6 +23,7 @@
 package org.lamsfoundation.lams.admin.web;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -93,13 +94,14 @@
 		Map<String,Object> properties = new HashMap<String,Object>();
 		properties.put("organisationType.organisationTypeId", 1);
 		properties.put("organisationState.organisationStateId", 1);
-		List list = userManagementService.findByProperties(Organisation.class, properties);
+		List<Organisation> list = userManagementService.findByProperties(Organisation.class, properties);
 		Organisation dummy = new Organisation();
 		dummy.setOrganisationId(-1);
 		dummy.setName(getMessageService().getMessage("sysadmin.organisation.select"));
 		if(list == null){
 			list = new ArrayList();
 		}
+		Collections.sort(list);
 		list.add(0,dummy);
 		request.setAttribute("orgs", list);
 		DynaActionForm serverOrgMapForm = (DynaActionForm)form;