diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb
index bf6a101..92c55f1 100644
--- a/app/controllers/public/search_controller.rb
+++ b/app/controllers/public/search_controller.rb
@@ -154,7 +154,7 @@ class SearchController < PublicController
     render :text => find_suggestions(normalize_term(params[:term]), environment, params[:asset]).to_json
   end
 
-  def search_for_users
+  def search_for_friends_and_members
     # If it isn't a ajax call give to the user an access denied response
     return render_access_denied unless request.xhr?
 
@@ -166,7 +166,7 @@ class SearchController < PublicController
               )[:results]
 
     if params[:community].present? and (community = Community.find_by_identifier params[:community])
-      scope = community.members # .select(:id, :name, :identifier) is not working here
+      scope = community.members.where.not(id: user.id) # .select(:id, :name, :identifier) is not working here
       results += find_by_contents(
                 :people, environment, scope,
                 params['q'], {:page => 1}
diff --git a/public/javascripts/user-mention.js b/public/javascripts/user-mention.js
index 96ef75d..5caf31f 100644
--- a/public/javascripts/user-mention.js
+++ b/public/javascripts/user-mention.js
@@ -9,7 +9,7 @@
 
     $('#comment_body, #leave_scrap_content, form.profile-wall-reply-form textarea').mentionsInput({
       onDataRequest: function (mode, keyword, onDataRequestCompleteCallback) {
-        var search_url = "/search/search_for_users?q="+keyword;
+        var search_url = "/search/search_for_friends_and_members?q="+keyword;
 
         $.ajax({
           method: "GET",
--
libgit2 0.21.2