diff --git a/app/controllers/locations_controller.rb b/app/controllers/locations_controller.rb
index dfd2e3435..5ce1c0700 100644
--- a/app/controllers/locations_controller.rb
+++ b/app/controllers/locations_controller.rb
@@ -21,7 +21,9 @@ class LocationsController < ApplicationController
   def show; end
 
   def deactivate
-    if params[:location][:confirm].present? && params[:location][:deactivation_date].present?
+    if params[:location].blank?
+      render "toggle_active", locals: { action: "deactivate" }
+    elsif params[:location][:confirm].present? && params[:location][:deactivation_date].present?
       confirm_deactivation
     else
       deactivation_date_errors
@@ -29,12 +31,7 @@ class LocationsController < ApplicationController
         @location.deactivation_date_type = params[:location][:deactivation_date_type]
         render "toggle_active", locals: { action: "deactivate" }, status: :unprocessable_entity
       else
-        deactivation_date_value = deactivation_date
-        if deactivation_date_value.blank?
-          render "toggle_active", locals: { action: "deactivate" }
-        else
-          render "toggle_active_confirm", locals: { action: "deactivate", deactivation_date: deactivation_date_value }
-        end
+        render "toggle_active_confirm", locals: { action: "deactivate", deactivation_date: deactivation_date }
       end
     end
   end
@@ -169,9 +166,9 @@ private
   def confirm_deactivation
     if @location.update(deactivation_date: params[:location][:deactivation_date])
       @location.lettings_logs.filter_by_before_startdate( params[:location][:deactivation_date]).update(location: nil)
-      flash[:notice] = "#{@location.name} has been deactivated"
+      flash[:notice] = "#{@location.name || @location.postcode} has been deactivated"
     end
-    redirect_to scheme_locations_path(@scheme)
+    redirect_to scheme_location_path(@scheme, @location)
     return
   end
 
diff --git a/app/views/locations/toggle_active_confirm.html.erb b/app/views/locations/toggle_active_confirm.html.erb
index bd8f328a9..452d66e48 100644
--- a/app/views/locations/toggle_active_confirm.html.erb
+++ b/app/views/locations/toggle_active_confirm.html.erb
@@ -3,14 +3,14 @@
        <%= govuk_back_link(href: :back) %>
      <% end %>
    <h1 class="govuk-heading-l">
-     <span class="govuk-caption-l"><%= @scheme.service_name %></span>
+     <span class="govuk-caption-l"><%= @location.postcode %></span>
      <%= "This change will affect #{@location.lettings_logs.count} logs" %>
    </h1>
    <%= govuk_warning_text text: I18n.t("warnings.location.deactivation.review_logs") %>
    <%= f.hidden_field :confirm, value: true %>
    <%= f.hidden_field :deactivation_date, value: deactivation_date %>
    <div class="govuk-button-group">
-     <%= f.govuk_submit "Deactivate this scheme" %>
+     <%= f.govuk_submit "Deactivate this location" %>
      <%= govuk_button_link_to "Cancel", scheme_location_path(scheme_id: @scheme, id: @location.id), html: { method: :get }, secondary: true %>
    </div>
  <% end %>