diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php
index a835ca3384e2a1c74eab0ee975b3ae17b0f7b5d3..471ff1f45ae7f63affae7b7c6f8dc99c00b6e594 100644
--- a/lib/private/User/Database.php
+++ b/lib/private/User/Database.php
@@ -290,6 +290,8 @@ class Database extends Backend implements IUserBackend {
 		if ($search !== '') {
 			$parameters[] = '%' . \OC::$server->getDatabaseConnection()->escapeLikeParameter($search) . '%';
 			$searchLike = ' WHERE LOWER(`uid`) LIKE LOWER(?)';
+			$parameters[] = '%' . \OC::$server->getDatabaseConnection()->escapeLikeParameter($search) . '%';
+			$searchLike .= ' OR LOWER(`displayname`) LIKE LOWER(?)';
 		}
 
 		$query = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users`' . $searchLike . ' ORDER BY LOWER(`uid`) ASC', $limit, $offset);
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index d583dc8690dcfae50ea90f55782d3ee3e4f59ff0..68c920dde178170e7b21025ff0ddf77e627a2afa 100644
--- a/settings/Controller/UsersController.php
+++ b/settings/Controller/UsersController.php
@@ -308,7 +308,7 @@ class UsersController extends Controller {
 		$userObjects = [];
 		$users = [];
 		if ($this->isAdmin) {
-			if ($gid !== '' && $gid !== '_disabledUsers') {
+			if ($gid !== '' && $gid !== '_disabledUsers' && $gid !== '_everyone') {
 				$batch = $this->getUsersForUID($this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset));
 			} else {
 				$batch = $this->userManager->search($pattern, $limit, $offset);