diff --git a/packages/strapi-plugin-users-permissions/config/queries/bookshelf.js b/packages/strapi-plugin-users-permissions/config/queries/bookshelf.js
index 50ccc302b2..404759ef7c 100644
--- a/packages/strapi-plugin-users-permissions/config/queries/bookshelf.js
+++ b/packages/strapi-plugin-users-permissions/config/queries/bookshelf.js
@@ -238,5 +238,15 @@ module.exports = {
         // Resolve silently.
         return Promise.resolve();
     }
+  },
+
+  search: async function (params) {
+    return this
+      .query(function(qb) {
+        qb
+        .where('username', 'LIKE', `%${params.id}%`)
+        .orWhere('email', 'LIKE', `%${params.id}%`);
+      })
+      .fetchAll();
   }
 };
diff --git a/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js b/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js
index 0a8d225c5b..3bb170f922 100644
--- a/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js
+++ b/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js
@@ -110,7 +110,6 @@ module.exports = {
 
   searchUsers: async (ctx) => {
     const data = await strapi.query('user', 'users-permissions').search(ctx.params);
-
     return ctx.send(data);
   },