Fix bug on existing orgs when group remains unchanged

app/controllers/organisations_controller.rb

@@ -128,7 +128,9 @@ class OrganisationsController < ApplicationController
 
   def update
     if (current_user.data_coordinator? && org_params[:active].nil?) || current_user.support?
-      @organisation.group = org_params[:group_member] ? helpers.assign_group_number(@organisation.id, org_params[:group_member_id]) : nil
+      if org_params[:group_member] && org_params[:group_member_id]
+        @organisation.group = helpers.assign_group_number(@organisation.id, org_params[:group_member_id])
+      end
       if @organisation.update(org_params)
         case org_params[:active]
         when "false"

app/models/organisation.rb

@@ -230,6 +230,8 @@ class Organisation < ApplicationRecord
 private
 
   def validate_profit_status
+    return if profit_status.nil?
+
     if provider_type == "LA" && profit_status != "local_authority"
       errors.add(:profit_status, I18n.t("validations.organisation.profit_status.must_be_LA"))
     end