Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
===================================================================
diff -u -r038e5f99f324f58bec83e1c51a60d02163d78b97 -r0fbf2ff50fece085171175031693134a96a7750f
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java	(.../UserController.java)	(revision 038e5f99f324f58bec83e1c51a60d02163d78b97)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java	(.../UserController.java)	(revision 0fbf2ff50fece085171175031693134a96a7750f)
@@ -42,7 +42,7 @@
 import org.lamsfoundation.lams.timezone.Timezone;
 import org.lamsfoundation.lams.timezone.dto.TimezoneDTO;
 import org.lamsfoundation.lams.timezone.service.ITimezoneService;
-import org.lamsfoundation.lams.timezone.util.TimezoneDTOComparator;
+import org.lamsfoundation.lams.timezone.util.TimezoneIDComparator;
 import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationState;
@@ -199,7 +199,7 @@
 
 	// Get all available time zones
 	List<Timezone> availableTimeZones = timezoneService.getDefaultTimezones();
-	TreeSet<TimezoneDTO> timezoneDtos = new TreeSet<>(new TimezoneDTOComparator());
+	TreeSet<TimezoneDTO> timezoneDtos = new TreeSet<>(new TimezoneIDComparator());
 	for (Timezone availableTimeZone : availableTimeZones) {
 	    String timezoneId = availableTimeZone.getTimezoneId();
 	    TimezoneDTO timezoneDto = new TimezoneDTO();
Fisheye: Tag 0fbf2ff50fece085171175031693134a96a7750f refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/timezone/util/TimezoneComparator.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0fbf2ff50fece085171175031693134a96a7750f refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/timezone/util/TimezoneDTOComparator.java'.
Fisheye: No comparison available.  Pass `N' to diff?