diff --git a/app/models/query.rb b/app/models/query.rb
index 1e8080b86..72c6a656b 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -534,6 +534,7 @@ class Query < ActiveRecord::Base
     author_values = []
     author_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
     author_values += users.sort_by(&:status).collect{|s| [s.name, s.id.to_s, l("status_#{User::LABEL_BY_STATUS[s.status]}")] }
+    author_values << [l(:label_user_anonymous), User.anonymous.id.to_s]
     author_values
   end
 
diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb
index 9b094ab97..8c2ae5f51 100644
--- a/test/functional/queries_controller_test.rb
+++ b/test/functional/queries_controller_test.rb
@@ -671,11 +671,12 @@ class QueriesControllerTest < Redmine::ControllerTest
     assert_equal 'application/json', response.content_type
     json = ActiveSupport::JSON.decode(response.body)
 
-    assert_equal 6, json.count
+    assert_equal 7, json.count
     # "me" value should not be grouped
     assert_include ["<< me >>", "me"], json
     assert_include ["Dave Lopper", "3", "active"], json
     assert_include ["Dave2 Lopper2", "5", "locked"], json
+    assert_include ["Anonymous", "#{User.anonymous.id}"], json
   end
 
   def test_user_filter_should_return_active_and_locked_users_grouped_by_status