diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb
index c342dc456..7623ca4af 100644
--- a/app/models/issue_query.rb
+++ b/app/models/issue_query.rb
@@ -181,6 +181,10 @@ class IssueQuery < Query
     }
   end
 
+  def author_values
+    super << [l(:label_user_anonymous), "#{User.anonymous.id}"]
+  end
+
   def available_columns
     return @available_columns if @available_columns
     @available_columns = self.class.available_columns.dup
diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb
index 9b094ab97..12f6c9172 100644
--- a/test/functional/queries_controller_test.rb
+++ b/test/functional/queries_controller_test.rb
@@ -25,6 +25,8 @@ class QueriesControllerTest < Redmine::ControllerTest
            :issues, :custom_fields, :custom_values,
            :queries
 
+  include Redmine::I18n
+
   def setup
     User.current = nil
   end
@@ -660,7 +662,7 @@ class QueriesControllerTest < Redmine::ControllerTest
     assert_include ["Dave2 Lopper2", "5", "locked"], json
   end
 
-  def test_author_filter_should_return_active_and_locked_users_grouped_by_status
+  def test_author_filter_should_return_active_and_locked_users_grouped_by_status_with_anonymous_user
     @request.session[:user_id] = 1
     get :filter, :params => {
         :project_id => 1,
@@ -671,11 +673,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 [l(:label_user_anonymous), "#{User.anonymous.id}"], json
   end
 
   def test_user_filter_should_return_active_and_locked_users_grouped_by_status