diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php
index a281572ad5584..dfbd995fb2ef2 100644
--- a/lib/private/User/Database.php
+++ b/lib/private/User/Database.php
@@ -193,7 +193,7 @@ public function getDisplayNames($search = '', $limit = null, $offset = null) {
 
 		$displayNames = array();
 		$query = \OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users`'
-			. $searchLike .' ORDER BY `uid` ASC', $limit, $offset);
+			. $searchLike .' ORDER BY LOWER(`displayname`), LOWER(`uid`) ASC', $limit, $offset);
 		$result = $query->execute($parameters);
 		while ($row = $result->fetchRow()) {
 			$displayNames[$row['uid']] = $row['displayname'];
@@ -279,7 +279,7 @@ public function getUsers($search = '', $limit = null, $offset = null) {
 			$searchLike = ' WHERE LOWER(`uid`) LIKE LOWER(?)';
 		}
 
-		$query = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users`' . $searchLike . ' ORDER BY `uid` ASC', $limit, $offset);
+		$query = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users`' . $searchLike . ' ORDER BY LOWER(`uid`) ASC', $limit, $offset);
 		$result = $query->execute($parameters);
 		$users = array();
 		while ($row = $result->fetchRow()) {
diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
index 3d016700ee333..77741efcc759f 100644
--- a/lib/private/User/Manager.php
+++ b/lib/private/User/Manager.php
@@ -254,7 +254,7 @@ public function searchDisplayName($pattern, $limit = null, $offset = null) {
 			 * @var \OC\User\User $a
 			 * @var \OC\User\User $b
 			 */
-			return strcmp($a->getDisplayName(), $b->getDisplayName());
+			return strcmp(strtolower($a->getDisplayName()), strtolower($b->getDisplayName()));
 		});
 		return $users;
 	}