diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb
index c1bdc3a71..93105f9ea 100644
--- a/app/models/validations/setup_validations.rb
+++ b/app/models/validations/setup_validations.rb
@@ -16,6 +16,15 @@ module Validations::SetupValidations
     scheme_during_startdate_validation(record, :scheme_id)
   end
 
+  def validate_organisation(record)
+    created_by, managing_organisation, owning_organisation = record.values_at("created_by", "managing_organisation", "owning_organisation")
+    unless [created_by, managing_organisation, owning_organisation].any?(&:blank?) || created_by.organisation == managing_organisation || created_by.organisation == owning_organisation
+      record.errors.add :created_by, I18n.t("validations.setup.created_by.invalid")
+      record.errors.add :owning_organisation_id, I18n.t("validations.setup.owning_organisation.invalid")
+      record.errors.add :managing_organisation_id, I18n.t("validations.setup.managing_organisation.invalid")
+    end
+  end
+
 private
 
   def intermediate_product_rent_type?(record)
diff --git a/spec/models/lettings_log_spec.rb b/spec/models/lettings_log_spec.rb
index 01a72e29e..67db22f46 100644
--- a/spec/models/lettings_log_spec.rb
+++ b/spec/models/lettings_log_spec.rb
@@ -2,9 +2,9 @@ require "rails_helper"
 require "shared/shared_examples_for_derived_fields"
 
 RSpec.describe LettingsLog do
-  let(:owning_organisation) { FactoryBot.create(:organisation) }
   let(:different_managing_organisation) { FactoryBot.create(:organisation) }
   let(:created_by_user) { FactoryBot.create(:user) }
+  let(:owning_organisation) { created_by_user.organisation }
   let(:fake_2021_2022_form) { Form.new("spec/fixtures/forms/2021_2022.json") }
 
   before do
@@ -2013,11 +2013,6 @@ RSpec.describe LettingsLog do
       let(:lettings_log) { FactoryBot.create(:lettings_log, created_by: created_by_user) }
       let(:organisation_2) { FactoryBot.create(:organisation) }
 
-      it "clears the created by user set" do
-        expect { lettings_log.update!(owning_organisation: organisation_2) }
-          .to change { lettings_log.reload.created_by }.from(created_by_user).to(nil)
-      end
-
       context "when the organisation selected doesn't match the scheme set" do
         let(:scheme) { FactoryBot.create(:scheme, owning_organisation: created_by_user.organisation) }
         let(:location) { FactoryBot.create(:location, scheme:) }
@@ -2377,10 +2372,10 @@ RSpec.describe LettingsLog do
       let(:organisation_3) { FactoryBot.create(:organisation) }
 
       before do
-        FactoryBot.create(:lettings_log, :in_progress, owning_organisation: organisation_1, managing_organisation: organisation_1)
-        FactoryBot.create(:lettings_log, :completed, owning_organisation: organisation_1, managing_organisation: organisation_2)
-        FactoryBot.create(:lettings_log, :completed, owning_organisation: organisation_2, managing_organisation: organisation_1)
-        FactoryBot.create(:lettings_log, :completed, owning_organisation: organisation_2, managing_organisation: organisation_2)
+        FactoryBot.create(:lettings_log, :in_progress, owning_organisation: organisation_1, managing_organisation: organisation_1, created_by: nil)
+        FactoryBot.create(:lettings_log, :completed, owning_organisation: organisation_1, managing_organisation: organisation_2, created_by: nil)
+        FactoryBot.create(:lettings_log, :completed, owning_organisation: organisation_2, managing_organisation: organisation_1, created_by: nil)
+        FactoryBot.create(:lettings_log, :completed, owning_organisation: organisation_2, managing_organisation: organisation_2, created_by: nil)
       end
 
       it "filters by given organisation id" do
@@ -2527,51 +2522,4 @@ RSpec.describe LettingsLog do
       end
     end
   end
-
-  describe "non support validation" do
-    it "validates if neither managing nor owning organisation is the same as current user organisation" do
-      lettings_log = FactoryBot.build(:lettings_log, owning_organisation:, managing_organisation: owning_organisation)
-
-      lettings_log.user_organisation_chosen?(created_by_user)
-      expect(lettings_log.errors[:created_by]).to include(I18n.t("validations.setup.created_by.invalid"))
-      expect(lettings_log.errors[:owning_organisation_id]).to include(I18n.t("validations.setup.owning_organisation.invalid"))
-      expect(lettings_log.errors[:managing_organisation_id]).to include(I18n.t("validations.setup.managing_organisation.invalid"))
-    end
-
-    it "doesn not validate if either managing or owning organisation is the same as current user organisation" do
-      lettings_log = FactoryBot.build(:lettings_log, owning_organisation: created_by_user.organisation, managing_organisation: owning_organisation)
-
-      lettings_log.user_organisation_chosen?(created_by_user)
-      expect(lettings_log.errors[:created_by]).to be_empty
-      expect(lettings_log.errors[:owning_organisation_id]).to be_empty
-      expect(lettings_log.errors[:managing_organisation_id]).to be_empty
-    end
-
-    it "does not validate if current user is missing" do
-      lettings_log = FactoryBot.build(:lettings_log, created_by: nil, owning_organisation:, managing_organisation: owning_organisation)
-
-      lettings_log.user_organisation_chosen?(nil)
-      expect(lettings_log.errors[:created_by]).to be_empty
-      expect(lettings_log.errors[:owning_organisation_id]).to be_empty
-      expect(lettings_log.errors[:managing_organisation_id]).to be_empty
-    end
-
-    it "does not validate if managing organisation is missing" do
-      lettings_log = FactoryBot.build(:lettings_log, owning_organisation:, managing_organisation: nil)
-
-      lettings_log.user_organisation_chosen?(created_by_user)
-      expect(lettings_log.errors[:created_by]).to be_empty
-      expect(lettings_log.errors[:owning_organisation_id]).to be_empty
-      expect(lettings_log.errors[:managing_organisation_id]).to be_empty
-    end
-
-    it "does not validate if owning organisation is missing" do
-      lettings_log = FactoryBot.build(:lettings_log, owning_organisation: nil, managing_organisation: owning_organisation)
-
-      lettings_log.user_organisation_chosen?(created_by_user)
-      expect(lettings_log.errors[:created_by]).to be_empty
-      expect(lettings_log.errors[:owning_organisation_id]).to be_empty
-      expect(lettings_log.errors[:managing_organisation_id]).to be_empty
-    end
-  end
 end
diff --git a/spec/models/validations/setup_validations_spec.rb b/spec/models/validations/setup_validations_spec.rb
index df21a4dc4..701e410ad 100644
--- a/spec/models/validations/setup_validations_spec.rb
+++ b/spec/models/validations/setup_validations_spec.rb
@@ -224,4 +224,64 @@ RSpec.describe Validations::SetupValidations do
       end
     end
   end
+
+  describe "#validate_organisation" do
+    let(:user) { FactoryBot.create(:user) }
+    let(:other_organisation) { FactoryBot.create(:organisation) }
+
+    it "validates if neither managing nor owning organisation is the same as created_by user organisation" do
+      record.created_by = user
+      record.owning_organisation = other_organisation
+      record.managing_organisation = other_organisation
+
+      setup_validator.validate_organisation(record)
+      expect(record.errors["created_by"]).to include(I18n.t("validations.setup.created_by.invalid"))
+      expect(record.errors["owning_organisation_id"]).to include(I18n.t("validations.setup.owning_organisation.invalid"))
+      expect(record.errors["managing_organisation_id"]).to include(I18n.t("validations.setup.managing_organisation.invalid"))
+    end
+
+    it "doesn not validate if either managing or owning organisation is the same as current user organisation" do
+      record.created_by = user
+      record.owning_organisation = user.organisation
+      record.managing_organisation = other_organisation
+
+      setup_validator.validate_organisation(record)
+      expect(record.errors["created_by"]).to be_empty
+      expect(record.errors["owning_organisation_id"]).to be_empty
+      expect(record.errors["managing_organisation_id"]).to be_empty
+    end
+
+    it "does not validate if current user is missing" do
+      record.created_by = nil
+      record.owning_organisation = other_organisation
+      record.managing_organisation = other_organisation
+
+      setup_validator.validate_organisation(record)
+      expect(record.errors["created_by"]).to be_empty
+      expect(record.errors["owning_organisation_id"]).to be_empty
+      expect(record.errors["managing_organisation_id"]).to be_empty
+    end
+
+    it "does not validate if managing organisation is missing" do
+      record.created_by = user
+      record.owning_organisation = other_organisation
+      record.managing_organisation = nil
+
+      setup_validator.validate_organisation(record)
+      expect(record.errors["created_by"]).to be_empty
+      expect(record.errors["owning_organisation_id"]).to be_empty
+      expect(record.errors["managing_organisation_id"]).to be_empty
+    end
+
+    it "does not validate if owning organisation is missing" do
+      record.created_by = user
+      record.owning_organisation = nil
+      record.managing_organisation = other_organisation
+
+      setup_validator.validate_organisation(record)
+      expect(record.errors["created_by"]).to be_empty
+      expect(record.errors["owning_organisation_id"]).to be_empty
+      expect(record.errors["managing_organisation_id"]).to be_empty
+    end
+  end
 end