diff --git a/admin/common.inc.php b/admin/common.inc.php
index ee0b24a..2d3b5a1 100644
--- a/admin/common.inc.php
+++ b/admin/common.inc.php
@@ -117,9 +117,11 @@ if (!empty($errmsgs)) {
   errorAsHtml(implode("<br />", $errmsgs));
 }
 
+function cmp_by_usernames($user1, $user2) {
+  return strcmp($user1['username'], $user2['username']);
+}
+
 $namemapdata = file_get_contents($davconfig['namemap.file']);
 $namemap = json_decode($namemapdata, true);
-if ($namemap === NULL) {
-  $namemap = array();
-}
+uasort($namemap, "cmp_by_usernames");
 ?>
\ No newline at end of file