diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 37b635f3..27260688 100755
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,8 +4,9 @@ Changelog
 not yet released
 ----------------
 
- * Added Chinese translation.
+ * #57: Added Chinese translation.
  * Sphinx is now used for documentation <http://sphinx.pocoo.org/>.
+ * #58: Server order on users page now matches the order on servers page.
 
 
 v3.0.0 (released April 6, 2014)
@@ -86,4 +87,4 @@ v1.0.1 (released September 18, 2008)
 v1.0.0 (released July 16, 2008)
 -------------------------------
 
- * Initial release
\ No newline at end of file
+ * Initial release
diff --git a/src/psm/Module/User/Controller/UserController.class.php b/src/psm/Module/User/Controller/UserController.class.php
index 609f0f2f..0aca3587 100644
--- a/src/psm/Module/User/Controller/UserController.class.php
+++ b/src/psm/Module/User/Controller/UserController.class.php
@@ -55,7 +55,7 @@ class UserController extends AbstractController {
 
 	public function initialize() {
 		$this->user_validator = new \psm\Util\User\UserValidator($this->user);
-		$servers = $this->db->select(PSM_DB_PREFIX.'servers', null, array('server_id', 'label'));
+		$servers = $this->db->select(PSM_DB_PREFIX.'servers', null, array('server_id', 'label'), '', "ORDER BY `active` ASC, `status` DESC, `label` ASC");
 		// change the indexes to reflect their server ids
 		foreach($servers as $server) {
 			$this->servers[$server['server_id']] = $server;