Radio value labels before type cast

app/views/schemes/details.html.erb

@@ -64,18 +64,18 @@
       <% end %>
 
       <% 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_before_type_cast,
-      <%= f.govuk_collection_radio_buttons :support_services_provider,
                                            support_services_provider_selection,
                                            :id,
-                                           :name,
+                                           ->(option) do 
+                                              if option.id.zero? && !current_user.support?
+                                                "Your organisation"
+                                              else 
+                                                option.name
+                                              end
+                                           end,
                                            legend: { text: "Who provides the support services used by this scheme?", size: "m" } %>
 
       <%= f.hidden_field :page, value: "details" %>