diff --git a/app/controllers/schemes_controller.rb b/app/controllers/schemes_controller.rb
index 443a28ecd..b86676fc6 100644
--- a/app/controllers/schemes_controller.rb
+++ b/app/controllers/schemes_controller.rb
@@ -30,7 +30,7 @@ class SchemesController < ApplicationController
     validation_errors scheme_params
 
     if @scheme.errors.empty? && @scheme.save
-      if scheme_params[:support_services_provider] == "The same organisation that owns the housing stock"
+      if scheme_params[:support_services_provider].zero?
         redirect_to scheme_primary_client_group_path(@scheme)
       else
         redirect_to scheme_support_services_provider_path(@scheme)
@@ -139,7 +139,7 @@ private
     when "support"
       new_location_path
     when "details"
-      if @scheme.support_services_provider.eql? "The same organisation that owns the housing stock"
+      if @scheme.support_services_provider.eql? "0"
         scheme_primary_client_group_path(@scheme)
       else
         scheme_support_services_provider_path(@scheme)
@@ -164,11 +164,12 @@ private
                                                      :support_services_provider,
                                                      :intended_stay)
 
-    same_org_providing_support = required_params[:support_services_provider] == "The same organisation that owns the housing stock"
+    same_org_providing_support = required_params[:support_services_provider] == "0"
 
     full_params = same_org_providing_support && required_params[:owning_organisation_id].present? ? required_params.merge(managing_organisation_id: required_params[:owning_organisation_id]) : required_params
 
     full_params[:sensitive] = full_params[:sensitive].to_i if full_params[:sensitive]
+    full_params[:support_services_provider] = full_params[:support_services_provider].to_i if full_params[:support_services_provider]
     if current_user.data_coordinator?
       full_params[:owning_organisation_id] = current_user.organisation_id
     end
diff --git a/app/views/schemes/details.html.erb b/app/views/schemes/details.html.erb
index 788c36ce6..7acf72a0b 100644
--- a/app/views/schemes/details.html.erb
+++ b/app/views/schemes/details.html.erb
@@ -63,7 +63,14 @@
                                       "data-controller": %w[accessible-autocomplete conditional-filter] %>
       <% end %>
 
-      <% support_services_provider_selection = Scheme.support_services_providers.keys.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
+      <% support_services_provider_selection = Scheme.support_services_providers.map do |key, value| %>
+        <% if value.zero? %>
+          <% selection_value = current_user.support? ? "The same organisation that owns the housing stock" : "Your organisation" %>
+          <% OpenStruct.new(id: value, name: selection_value)  %>
+        <% else %>
+          <% OpenStruct.new(id: value, name: key.to_s.humanize)  %>
+        <% end %>
+      <% end %>
 
       <%= f.govuk_collection_radio_buttons :support_services_provider,
                                            support_services_provider_selection,
diff --git a/app/views/schemes/new.html.erb b/app/views/schemes/new.html.erb
index eca8de2a3..65fc6d9ba 100644
--- a/app/views/schemes/new.html.erb
+++ b/app/views/schemes/new.html.erb
@@ -65,7 +65,14 @@
                                       "data-controller": %w[accessible-autocomplete conditional-filter] %>
       <% end %>
 
-      <% support_services_provider_selection = Scheme.support_services_providers.keys.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
+      <% support_services_provider_selection = Scheme.support_services_providers.map do |key, value| %>
+        <% if value.zero? %>
+          <% selection_value = current_user.support? ? "The same organisation that owns the housing stock" : "Your organisation" %>
+          <% OpenStruct.new(id: value, name: selection_value)  %>
+        <% else %>
+            <% OpenStruct.new(id: value, name: key.to_s.humanize)  %>
+        <% end %>
+      <% end %>
 
       <%= f.govuk_collection_radio_buttons :support_services_provider,
                                            support_services_provider_selection,