diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb
index e2273f3de..7093b1cee 100644
--- a/app/helpers/filters_helper.rb
+++ b/app/helpers/filters_helper.rb
@@ -44,7 +44,7 @@ module FiltersHelper
   end
 
   def assigned_to_filter_options(user)
-    user_options = user.support? ? User.all : user.organisation.users
+    user_options = user.support? ? User.all : (user.organisation.users + user.organisation.managing_agents.flat_map(&:users) + user.organisation.stock_owners.flat_map(&:users))
     [OpenStruct.new(id: "", name: "Select an option")] + user_options.map { |user_option| OpenStruct.new(id: user_option.id, name: user_option.name) }
   end