diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index 6c24c5da8d4..47f08563659 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -149,10 +149,9 @@ class AccountSearchService < BaseService
             },
 
             {
-              multi_match: {
+              combined_fields: {
                 query: @query,
-                type: 'best_fields',
-                fields: %w(text text.*),
+                fields: %w(username^2 display_name^2 text),
                 operator: 'and',
               },
             },