diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8c4686..8c17aea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Users can confirm passwords
 - Support Nextcloud password_policy
+- Extend user/group search
 
 ### Fixed
 - Getting user display names backend
diff --git a/lib/Query/QueryProvider.php b/lib/Query/QueryProvider.php
index 15092cb..eca7571 100644
--- a/lib/Query/QueryProvider.php
+++ b/lib/Query/QueryProvider.php
@@ -140,6 +140,7 @@ class QueryProvider implements \ArrayAccess
                 "SELECT $groupColumns " .
                 "FROM $group g " .
                 "WHERE g.$gGID LIKE :$searchParam " .
+                (empty($gName) ? "" : "OR g.$gName LIKE :$searchParam ") .
                 "ORDER BY g.$gGID",
 
             Query::FIND_USER =>
@@ -163,6 +164,8 @@ class QueryProvider implements \ArrayAccess
                 "SELECT $userColumns " .
                 "FROM $user u " .
                 "WHERE u.$uUID LIKE :$searchParam " .
+                (empty($uName) ? "" : "OR u.$uName LIKE :$searchParam ") .
+                (empty($uEmail) ? "" : "OR u.$uEmail LIKE :$searchParam ") .
                 "ORDER BY u.$uUID",
 
             Query::UPDATE_DISPLAY_NAME =>