diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 91b0ccd40..f4e74c373 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -33,7 +33,7 @@ class UsersController < ApplicationController
   end
 
   def search
-    user_options = current_user.support? ? User.all : User.own_and_managing_org_users(current_user.organisation)
+    user_options = User.visible_to_user(current_user)
     users = user_options.search_by(params["query"]).limit(20)
 
     user_data = users.each_with_object({}) do |user, hash|
diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb
index 974fb88d7..b2ebb2549 100644
--- a/app/helpers/filters_helper.rb
+++ b/app/helpers/filters_helper.rb
@@ -112,11 +112,7 @@ module FiltersHelper
   def assigned_to_filter_options(filter_type)
     if applied_filters(filter_type)["assigned_to"] == "specific_user" && applied_filters(filter_type)["user"].present?
       user_id = applied_filters(filter_type)["user"]
-      selected_user = if current_user.support?
-                        User.where(id: user_id)&.first
-                      else
-                        User.own_and_managing_org_users(current_user.organisation).where(id: user_id)&.first
-                      end
+      selected_user = User.visible_to_user(current_user).where(id: user_id)&.first
 
       return [OpenStruct.new(id: selected_user.id, name: selected_user.name, hint: selected_user.email)] if selected_user.present?
     end
@@ -309,21 +305,14 @@ private
     return "All" if session_filters["assigned_to"].include?("all")
     return "You" if session_filters["assigned_to"].include?("you")
 
-    selected_user_option = find_selected_specific_user(session_filters)
+    user_id = session_filters["user"].to_i
+    selected_user_option = User.visible_to_user(current_user).where(id: user_id)&.first
+
     return unless selected_user_option
 
     "#{selected_user_option.name} (#{selected_user_option.email})"
   end
 
-  def find_selected_specific_user(session_filters)
-    user_id = session_filters["user"].to_i
-    if current_user.support?
-      User.find(user_id)
-    else
-      User.own_and_managing_org_users(current_user.organisation).find(user_id)
-    end
-  end
-
   def formatted_owned_by_filter(session_filters, filter_type)
     return "All" if params["id"].blank? && (session_filters["owning_organisation"].blank? || session_filters["owning_organisation"]&.include?("all"))
 
diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb
index 7bf963212..ebc2f5f1e 100644
--- a/app/models/lettings_log.rb
+++ b/app/models/lettings_log.rb
@@ -132,7 +132,7 @@ class LettingsLog < Log
           illness_type_10: false)
   }
 
-  scope :filter_by_user_text_search, ->(param, user) { where(assigned_to: user.support? ? User.search_by(param) : User.own_and_managing_org_users(user.organisation).search_by(param)) }
+  scope :filter_by_user_text_search, ->(param, user) { where(assigned_to: User.visible_to_user(user).search_by(param)) }
   scope :filter_by_owning_organisation_text_search, ->(param, _user) { where(owning_organisation: Organisation.search_by(param)) }
   scope :filter_by_managing_organisation_text_search, ->(param, _user) { where(managing_organisation: Organisation.search_by(param)) }
 
diff --git a/app/models/log.rb b/app/models/log.rb
index 3a6c1e982..f98de6a93 100644
--- a/app/models/log.rb
+++ b/app/models/log.rb
@@ -53,7 +53,7 @@ class Log < ApplicationRecord
   scope :filter_by_organisation, ->(org, _user = nil) { where(owning_organisation: org).or(where(managing_organisation: org)) }
   scope :filter_by_owning_organisation, ->(owning_organisation, _user = nil) { where(owning_organisation:) }
   scope :filter_by_managing_organisation, ->(managing_organisation, _user = nil) { where(managing_organisation:) }
-  scope :filter_by_user_text_search, ->(param, user) { where(assigned_to: user.support? ? User.search_by(param) : User.own_and_managing_org_users(user.organisation).search_by(param)) }
+  scope :filter_by_user_text_search, ->(param, user) { where(assigned_to: User.visible_to_user(user).search_by(param)) }
   scope :filter_by_owning_organisation_text_search, ->(param, _user) { where(owning_organisation: Organisation.search_by(param)) }
   scope :filter_by_managing_organisation_text_search, ->(param, _user) { where(managing_organisation: Organisation.search_by(param)) }
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 0a26a254b..85c68932a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -85,7 +85,7 @@ class User < ApplicationRecord
   scope :deactivated, -> { where(active: false) }
   scope :active_status, -> { where(active: true).where.not(last_sign_in_at: nil) }
   scope :visible, -> { where(discarded_at: nil) }
-  scope :own_and_managing_org_users, ->(organisation) { where(organisation: organisation.child_organisations + [organisation]) }
+  scope :visible_to_user, ->(user) { user.support? ? visible : visible.where(organisation: user.organisation.absorbed_organisations + [user.organisation]) }
 
   attr_accessor :log_reassignment