diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index bb47ff16a4..f88cf2c8c9 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -47,7 +47,7 @@ def textSearch_all(srchString)
   def textSearch_profiles(srchString)
     sresult = DocList.new
 
-    users = SrchScope.find_users(srchString, limit = nil)
+    users = SrchScope.find_users(srchString, limit = 10) # don't return hundreds!!
     # User profiles
     users.each do |match|
       doc = DocResult.fromSearch(0, 'user', '/profile/' + match.name, match.name, '', 0)
diff --git a/app/services/srch_scope.rb b/app/services/srch_scope.rb
index 1de740228c..23ceb27441 100644
--- a/app/services/srch_scope.rb
+++ b/app/services/srch_scope.rb
@@ -2,9 +2,9 @@
 class SrchScope
   def self.find_users(input, limit)
     if ActiveRecord::Base.connection.adapter_name == 'Mysql2'
-      User.order('id DESC')
+      User.search(input)
+          .order('id DESC')
           .where(status: 1)
-          .where('username LIKE ?', '%' + input + '%')
           .limit(limit)
     else
       User.order('id DESC')