diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 37d92561..470ed3ad 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,7 @@ Changelog
 Not yet released
 ----------------
 
+* #635: Changed server order on ?&mod=user&action=edit&id=x.
 * #634: Changed ' to " in sql query, both were used.
 * #629: Fix bug that made it impossible to check rdp:// and fixed port update.
 * b49659f: Added question to notification faq about not recieving notifications.
diff --git a/src/psm/Module/User/Controller/UserController.php b/src/psm/Module/User/Controller/UserController.php
index 5c32cf5b..035c49d5 100644
--- a/src/psm/Module/User/Controller/UserController.php
+++ b/src/psm/Module/User/Controller/UserController.php
@@ -49,7 +49,7 @@ class UserController extends AbstractController {
 	}
 
 	public function run($action = NULL) {
-		$servers = $this->db->select(PSM_DB_PREFIX.'servers', null, array('server_id', 'label'), '', "ORDER BY `active` ASC, `status` DESC, `label` ASC");
+		$servers = $this->db->select(PSM_DB_PREFIX.'servers', null, array('server_id', 'label'), '', "ORDER BY `label` ASC");
 		// change the indexes to reflect their server ids
 		foreach ($servers as $server) {
 			$this->servers[$server['server_id']] = $server;
@@ -110,6 +110,7 @@ class UserController extends AbstractController {
 					'label' => $servers_labels[$server_id]
 				);
 			}
+			sort($user['emp_servers']);
 
 			$user['url_delete'] = psm_build_url(array(
 				'mod' => 'user',