diff --git a/app/controllers/organisation_relationships_controller.rb b/app/controllers/organisation_relationships_controller.rb
index 29c572f62..2152cebfd 100644
--- a/app/controllers/organisation_relationships_controller.rb
+++ b/app/controllers/organisation_relationships_controller.rb
@@ -5,13 +5,19 @@ class OrganisationRelationshipsController < ApplicationController
   before_action :authenticate_user!
   before_action :authenticate_scope!
 
+  before_action :organisations
+  before_action :target_organisation, only: %i[
+    remove_housing_provider
+    remove_managing_agent
+    delete_housing_provider
+    delete_managing_agent
+  ]
+
   def housing_providers
     housing_providers = organisation.housing_providers
     unpaginated_filtered_housing_providers = filtered_collection(housing_providers, search_term)
-    organisations = Organisation.where.not(id: @organisation.id).pluck(:id, :name)
-    respond_to :html
+
     @pagy, @housing_providers = pagy(unpaginated_filtered_housing_providers)
-    @organisations = organisations
     @searched = search_term.presence
     @total_count = housing_providers.size
   end
@@ -19,95 +25,85 @@ class OrganisationRelationshipsController < ApplicationController
   def managing_agents
     managing_agents = organisation.managing_agents
     unpaginated_filtered_managing_agents = filtered_collection(managing_agents, search_term)
-    organisations = Organisation.where.not(id: @organisation.id).pluck(:id, :name)
-    respond_to :html
+
     @pagy, @managing_agents = pagy(unpaginated_filtered_managing_agents)
-    @organisations = organisations
     @searched = search_term.presence
     @total_count = managing_agents.size
   end
 
   def add_housing_provider
-    @organisations = Organisation.where.not(id: @organisation.id).pluck(:id, :name)
-    respond_to :html
+    @organisation_relationship = organisation.parent_organisation_relationships.new
   end
 
   def add_managing_agent
-    @organisations = Organisation.where.not(id: @organisation.id).pluck(:id, :name)
-    respond_to :html
+    @organisation_relationship = organisation.child_organisation_relationships.new
   end
 
   def create_housing_provider
-    child_organisation = @organisation
-    if params[:organisation_relationship].present? && params[:organisation_relationship][:related_organisation_id].present?
-      parent_organisation = related_organisation
-    end
-    @organisation_relationship = OrganisationRelationship.new(child_organisation:, parent_organisation:)
-    if @organisation_relationship.save(context: :housing_provider)
-      flash[:notice] = "#{related_organisation.name} is now one of #{current_user.data_coordinator? ? 'your' : "this organisation's"} housing providers"
+    @organisation_relationship = organisation.parent_organisation_relationships.new(organisation_relationship_params)
+    if @organisation_relationship.save
+      flash[:notice] = "#{@organisation_relationship.parent_organisation.name} is now one of #{current_user.data_coordinator? ? 'your' : "this organisation's"} housing providers"
       redirect_to housing_providers_organisation_path
     else
-      @organisations = Organisation.where.not(id: child_organisation.id).pluck(:id, :name)
+      @organisations = Organisation.where.not(id: organisation.id).pluck(:id, :name)
       render "organisation_relationships/add_housing_provider", status: :unprocessable_entity
     end
   end
 
   def create_managing_agent
-    parent_organisation = @organisation
-    if params[:organisation_relationship].present? && params[:organisation_relationship][:related_organisation_id].present?
-      child_organisation = related_organisation
-    end
-    @organisation_relationship = OrganisationRelationship.new(child_organisation:, parent_organisation:)
-    if @organisation_relationship.save(context: :managing_agent)
-      flash[:notice] = "#{related_organisation.name} is now one of #{current_user.data_coordinator? ? 'your' : "this organisation's"} managing agents"
+    @organisation_relationship = organisation.child_organisation_relationships.new(organisation_relationship_params)
+    if @organisation_relationship.save
+      flash[:notice] = "#{@organisation_relationship.child_organisation.name} is now one of #{current_user.data_coordinator? ? 'your' : "this organisation's"} managing agents"
       redirect_to managing_agents_organisation_path
     else
-      @organisations = Organisation.where.not(id: parent_organisation.id).pluck(:id, :name)
+      @organisations = Organisation.where.not(id: organisation.id).pluck(:id, :name)
       render "organisation_relationships/add_managing_agent", status: :unprocessable_entity
     end
   end
 
-  def remove_housing_provider
-    @target_organisation_id = target_organisation.id
-  end
+  def remove_housing_provider; end
+  def remove_managing_agent;   end
 
   def delete_housing_provider
-    relationship = OrganisationRelationship.find_by!(
-      child_organisation: @organisation,
+    OrganisationRelationship.find_by!(
+      child_organisation: organisation,
       parent_organisation: target_organisation,
-    )
-    relationship.destroy!
+    ).destroy!
+
     flash[:notice] = "#{target_organisation.name} is no longer one of #{current_user.data_coordinator? ? 'your' : "this organisation's"} housing providers"
     redirect_to housing_providers_organisation_path
   end
 
-  def remove_managing_agent
-    @target_organisation_id = target_organisation.id
-  end
-
   def delete_managing_agent
-    relationship = OrganisationRelationship.find_by!(
-      parent_organisation: @organisation,
+    OrganisationRelationship.find_by!(
+      parent_organisation: organisation,
       child_organisation: target_organisation,
-    )
-    relationship.destroy!
+    ).destroy!
+
     flash[:notice] = "#{target_organisation.name} is no longer one of #{current_user.data_coordinator? ? 'your' : "this organisation's"} managing agents"
     redirect_to managing_agents_organisation_path
   end
 
 private
 
-  def create!(child_organisation:, parent_organisation:)
-    @resource = OrganisationRelationship.new(child_organisation:, parent_organisation:)
-    @resource.save!
+  def organisation
+    @organisation ||= if current_user.support?
+                        Organisation.find(params[:id])
+                      else
+                        current_user.organisation
+                      end
   end
 
-  def organisation
-    @organisation ||= Organisation.find(params[:id])
+  def organisations
+    @organisations ||= Organisation.where.not(id: organisation.id).pluck(:id, :name)
   end
 
-  def related_organisation
-    @related_organisation ||= Organisation.find(params[:organisation_relationship][:related_organisation_id])
+  def parent_organisation
+    @parent_organisation ||= Organisation.find(params[:organisation_relationship][:parent_organisation_id])
+  end
+
+  def child_organisation
+    @child_organisation ||= Organisation.find(params[:organisation_relationship][:child_organisation_id])
   end
 
   def target_organisation
@@ -118,6 +114,10 @@ private
     params["search"]
   end
 
+  def organisation_relationship_params
+    params.require(:organisation_relationship).permit(:parent_organisation_id, :child_organisation_id)
+  end
+
   def authenticate_scope!
     if current_user.organisation != organisation && !current_user.support?
       render_not_found
diff --git a/app/models/organisation_relationship.rb b/app/models/organisation_relationship.rb
index 72f74cbb9..f70677b5a 100644
--- a/app/models/organisation_relationship.rb
+++ b/app/models/organisation_relationship.rb
@@ -1,26 +1,26 @@
 class OrganisationRelationship < ApplicationRecord
   belongs_to :child_organisation, class_name: "Organisation"
   belongs_to :parent_organisation, class_name: "Organisation"
-  validate :validate_housing_provider_relationship, on: :housing_provider
-  validate :validate_managing_agent_relationship, on: :managing_agent
+  validate :validate_housing_provider_relationship
+  validate :validate_managing_agent_relationship
 
 private
 
   def validate_housing_provider_relationship
     if parent_organisation_id.blank?
-      errors.add :related_organisation_id, "You must choose a housing provider"
+      errors.add :parent_organisation_id, "You must choose a housing provider"
     elsif OrganisationRelationship.exists?(child_organisation:, parent_organisation:)
-      errors.add :related_organisation_id, "You have already added this housing provider"
+      errors.add :parent_organisation_id, "You have already added this housing provider"
     elsif parent_organisation_id.present? && !parent_organisation.holds_own_stock
-      errors.add :related_organisation_id, I18n.t("validations.scheme.owning_organisation.does_not_own_stock")
+      errors.add :parent_organisation_id, I18n.t("validations.scheme.owning_organisation.does_not_own_stock")
     end
   end
 
   def validate_managing_agent_relationship
     if child_organisation_id.blank?
-      errors.add :related_organisation_id, "You must choose a managing agent"
+      errors.add :child_organisation_id, "You must choose a managing agent"
     elsif OrganisationRelationship.exists?(child_organisation:, parent_organisation:)
-      errors.add :related_organisation_id, "You have already added this managing agent"
+      errors.add :child_organisation_id, "You have already added this managing agent"
     end
   end
 end
diff --git a/app/views/organisation_relationships/_related_organisation_select_question.html.erb b/app/views/organisation_relationships/_related_organisation_select_question.html.erb
index cc27c2b8b..551bce5ed 100644
--- a/app/views/organisation_relationships/_related_organisation_select_question.html.erb
+++ b/app/views/organisation_relationships/_related_organisation_select_question.html.erb
@@ -1,3 +1,3 @@
 <% answers = question.answer_options.map { |key, value| OpenStruct.new(id: key, name: value) } %>
-<%= f.govuk_collection_select :related_organisation_id, answers, :id, :name, label: { hidden: true }, "data-controller": "accessible-autocomplete" do %>
+<%= f.govuk_collection_select field, answers, :id, :name, label: { hidden: true }, "data-controller": "accessible-autocomplete" do %>
 <% end %>
diff --git a/app/views/organisation_relationships/add_housing_provider.html.erb b/app/views/organisation_relationships/add_housing_provider.html.erb
index 4171e89af..cb95fd6ac 100644
--- a/app/views/organisation_relationships/add_housing_provider.html.erb
+++ b/app/views/organisation_relationships/add_housing_provider.html.erb
@@ -18,6 +18,7 @@
     <% answer_options[organisation[0]] = organisation[1] %>
   <% end %>
   <%= render partial: "organisation_relationships/related_organisation_select_question", locals: {
+    field: :parent_organisation_id,
     question: Form::Question.new("", { "answer_options" => answer_options }, nil),
     f:,
   } %>
diff --git a/app/views/organisation_relationships/add_managing_agent.html.erb b/app/views/organisation_relationships/add_managing_agent.html.erb
index 5bf3ac354..173e845ad 100644
--- a/app/views/organisation_relationships/add_managing_agent.html.erb
+++ b/app/views/organisation_relationships/add_managing_agent.html.erb
@@ -18,6 +18,7 @@
     <% answer_options[organisation[0]] = organisation[1] %>
   <% end %>
   <%= render partial: "organisation_relationships/related_organisation_select_question", locals: {
+    field: :child_organisation_id,
     question: Form::Question.new("", { "answer_options" => answer_options }, nil),
     f:,
   } %>
diff --git a/app/views/organisation_relationships/remove_managing_agent.html.erb b/app/views/organisation_relationships/remove_managing_agent.html.erb
index 2862acf64..3e4e50486 100644
--- a/app/views/organisation_relationships/remove_managing_agent.html.erb
+++ b/app/views/organisation_relationships/remove_managing_agent.html.erb
@@ -1,7 +1,7 @@
 <%= form_with url: managing_agents_organisation_path(target_organisation_id: @target_organisation.id), method: "delete", local: true do |f| %>
   <% if current_user.support? %>
-    <%= render partial: "organisations/headings", locals: { main: @organisation.name, sub: nil } %>
-    <%= render SubNavigationComponent.new(items: secondary_items(request.path, @organisation.id)) %>
+    <%= render partial: "organisations/headings", locals: { main: organisation.name, sub: nil } %>
+    <%= render SubNavigationComponent.new(items: secondary_items(request.path, organisation.id)) %>
     <h2 class="govuk-visually-hidden">Remove Managing Agent</h2>
   <% end %>
   <% if current_user.support? %>