diff --git a/app/controllers/schemes_controller.rb b/app/controllers/schemes_controller.rb
index c32aabfcb..7edd7ecd8 100644
--- a/app/controllers/schemes_controller.rb
+++ b/app/controllers/schemes_controller.rb
@@ -30,7 +30,7 @@ class SchemesController < ApplicationController
       render "schemes/primary_client_group"
     else
       @scheme.errors.add(:owning_organisation_id, message: @scheme.errors[:organisation])
-      @scheme.errors.delete(:organisation)
+      @scheme.errors.delete(:owning_organisation)
       render :new, status: :unprocessable_entity
     end
   end
diff --git a/app/views/schemes/details.html.erb b/app/views/schemes/details.html.erb
index d45d14fa9..229165fd4 100644
--- a/app/views/schemes/details.html.erb
+++ b/app/views/schemes/details.html.erb
@@ -27,10 +27,10 @@
 
        <% null_option = [OpenStruct.new(id: "", name: "Select an option")] %>
        <% organisations = Organisation.all.map { |org| OpenStruct.new(id: org.id, name: org.name) } %>
-       <% stock_org_answer_options = null_option + organisations %>
+       <% managing_org_answer_options = null_option + organisations %>
 
        <%= f.govuk_collection_select :managing_organisation_id,
-                                     organisations,
+                                     managing_org_answer_options,
                                      :id,
                                      :name,
                                      label: { text: "Which organisation manages this scheme?", size: "m" },
@@ -39,7 +39,7 @@
 
        <% if current_user.support? %>
          <%= f.govuk_collection_select :owning_organisation_id,
-                                       stock_org_answer_options,
+                                       organisations,
                                        :id,
                                        :name,
                                        label: { text: "Which organisation owns the housing stock for this scheme?", size: "m" },
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0c8fc4695..c41ed82dc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -43,8 +43,9 @@ en:
       models:
         scheme:
           attributes:
-            owning_organisation:
+            owninggit st  _organisation_id:
               required: "Enter the existing organisation’s name"
+              invalid: "Enter the existing organisation’s name"
 
   validations:
     organisation: