diff --git a/app/models/domain_status.rb b/app/models/domain_status.rb
index f83c436a7..bce3d1ec8 100644
--- a/app/models/domain_status.rb
+++ b/app/models/domain_status.rb
@@ -122,21 +122,23 @@ class DomainStatus < ActiveRecord::Base
   class << self
     def admin_statuses
       [
-        SERVER_DELETE_PROHIBITED, 
         SERVER_HOLD, 
-        SERVER_RENEW_PROHIBITED, 
-        SERVER_TRANSFER_PROHIBITED,
+        # sync with admin_statuses_map
+        # SERVER_MANUAL_INZONE, 
+        # SERVER_RENEW_PROHIBITED, 
+        # SERVER_TRANSFER_PROHIBITED,
+        # SERVER_REGISTRANT_CHANGE_PROHIBITED,
+        # SERVER_ADMIN_CHANGE_PROHIBITED, 
+        # SERVER_TECH_CHANGE_PROHIBITED
+        SERVER_DELETE_PROHIBITED, 
         SERVER_UPDATE_PROHIBITED, 
-        SERVER_MANUAL_INZONE, 
-        SERVER_REGISTRANT_CHANGE_PROHIBITED,
-        SERVER_ADMIN_CHANGE_PROHIBITED, 
-        SERVER_TECH_CHANGE_PROHIBITED
       ]
     end
 
     def admin_statuses_map
       [
         ['Hold', SERVER_HOLD], 
+        # sync with admin_statuses
         # ['ManualInzone', SERVER_MANUAL_INZONE], 
         # [''],
         # ['RenewProhibited', SERVER_RENEW_PROHIBITED], 
diff --git a/app/views/admin/domains/edit.haml b/app/views/admin/domains/edit.haml
index 36ddb3777..70596d00e 100644
--- a/app/views/admin/domains/edit.haml
+++ b/app/views/admin/domains/edit.haml
@@ -1,6 +1,13 @@
 - content_for :actions do
   = link_to(t(:add_new_status), '#', class: 'btn btn-primary js-add-status')
+  - if @domain.force_deletable?
+    = link_to(t(:set_force_delete), set_force_delete_admin_domain_path(@domain), 
+      method: :post, data: { confirm: t(:are_you_sure) }, class: 'btn btn-warning')
+  - else
+    = link_to(t(:unset_force_delete), unset_force_delete_admin_domain_path(@domain), 
+      method: :post, data: { confirm: t(:are_you_sure) }, class: 'btn btn-warning')
   = link_to(t(:back_to_domain), [:admin, @domain], class: 'btn btn-default')
+
 = render 'shared/title', name: "#{t(:edit)}: #{@domain.name}"
 
 = render 'form'
diff --git a/app/views/admin/domains/form/_pending_update.haml b/app/views/admin/domains/form/_pending_update.haml
new file mode 100644
index 000000000..72e7760d1
--- /dev/null
+++ b/app/views/admin/domains/form/_pending_update.haml
@@ -0,0 +1 @@
+yeah
diff --git a/app/views/admin/domains/partials/_statuses.haml b/app/views/admin/domains/partials/_statuses.haml
index 0f05f25d8..ab8e55e6c 100644
--- a/app/views/admin/domains/partials/_statuses.haml
+++ b/app/views/admin/domains/partials/_statuses.haml
@@ -11,7 +11,7 @@
         - @domain.statuses.each do |status|
           %tr
             %td
-              - if [DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_DELETE].include? status
+              - if @domain.pending_json.present? && [DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_DELETE].include?(status)
                 = link_to status, admin_domain_domain_versions_path(@domain.id)
               - else
                 = status
diff --git a/app/views/admin/domains/show.haml b/app/views/admin/domains/show.haml
index be4e37614..17a85b841 100644
--- a/app/views/admin/domains/show.haml
+++ b/app/views/admin/domains/show.haml
@@ -1,10 +1,6 @@
 - content_for :actions do
   = link_to(t(:edit_statuses), edit_admin_domain_path(@domain), class: 'btn btn-primary')
   = link_to(t(:history), admin_domain_domain_versions_path(@domain.id), method: :get, class: 'btn btn-primary')
-  - if @domain.force_deletable?
-    = link_to(t(:set_force_delete), set_force_delete_admin_domain_path(@domain), method: :post, data: { confirm: t(:are_you_sure) }, class: 'btn btn-warning')
-  - else
-    = link_to(t(:unset_force_delete), unset_force_delete_admin_domain_path(@domain), method: :post, data: { confirm: t(:are_you_sure) }, class: 'btn btn-warning')
 
 = render 'shared/title', name: @domain.name