diff --git a/html/includes/authentication/mysql.inc.php b/html/includes/authentication/mysql.inc.php
index 9e19f86068..312c5d9d04 100644
--- a/html/includes/authentication/mysql.inc.php
+++ b/html/includes/authentication/mysql.inc.php
@@ -153,7 +153,7 @@ function deluser($userid)
 
 function get_userlist()
 {
-    return dbFetchRows('SELECT * FROM `users`');
+    return dbFetchRows('SELECT * FROM `users` ORDER BY `username`');
 }//end get_userlist()
 
 
diff --git a/html/pages/edituser.inc.php b/html/pages/edituser.inc.php
index 5ef8f99b66..06060f7228 100644
--- a/html/pages/edituser.inc.php
+++ b/html/pages/edituser.inc.php
@@ -444,7 +444,17 @@ if ($_SESSION['userlevel'] != '10') {
                 <div class='col-sm-4'>
                   <select name='user_id' class='form-control input-sm'>";
         foreach ($user_list as $user_entry) {
-            echo "<option value='".$user_entry['user_id']."'>".$user_entry['username'].'</option>';
+            switch ($user_entry['level']) {
+                case "10":
+                    $user_level = ' (admin)';
+                    break;
+                case "11":
+                    $user_level = ' (demo)';
+                    break;
+                default:
+                    $user_level = '';
+            }
+            echo "<option value='".$user_entry['user_id']."'>".$user_entry['username'].$user_level.'</option>';
         }
 
         echo "</select>