diff --git a/app/models/query.rb b/app/models/query.rb
index 4df3d628b..db8906525 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -126,10 +126,10 @@ class Query < ActiveRecord::Base
                            "done_ratio" =>  { :type => :integer, :order => 13 }}                          
     
     user_values = []
+    user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by
     if project
       user_values += project.users.collect{|s| [s.name, s.id.to_s] }
     elsif executed_by
-      user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by
       # members of the user's projects
       user_values += executed_by.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }
     end