diff --git a/app/overrides/spree/admin/orders/customer_details/_form/make_email_fullwidth.html.haml.deface b/app/overrides/spree/admin/orders/customer_details/_form/make_email_fullwidth.html.haml.deface
deleted file mode 100644
index 409c3c90ab..0000000000
--- a/app/overrides/spree/admin/orders/customer_details/_form/make_email_fullwidth.html.haml.deface
+++ /dev/null
@@ -1,2 +0,0 @@
-/ set_attributes "div[data-hook='customer_fields'] div.alpha"
-/ attributes({class: "fullwidth"})
diff --git a/app/overrides/spree/admin/orders/customer_details/_form/remove_guest_order_buttons.deface b/app/overrides/spree/admin/orders/customer_details/_form/remove_guest_order_buttons.deface
deleted file mode 100644
index f94267be6f..0000000000
--- a/app/overrides/spree/admin/orders/customer_details/_form/remove_guest_order_buttons.deface
+++ /dev/null
@@ -1 +0,0 @@
-remove "div[data-hook='customer_fields'] div.omega"
diff --git a/app/views/spree/admin/orders/customer_details/_form.html.haml b/app/views/spree/admin/orders/customer_details/_form.html.haml
index 9b6065476a..e426f114b8 100644
--- a/app/views/spree/admin/orders/customer_details/_form.html.haml
+++ b/app/views/spree/admin/orders/customer_details/_form.html.haml
@@ -2,27 +2,10 @@
   %fieldset.index.no-border-bottom{"data-hook" => "customer_guest"}
     %legend{:align => "center"}= Spree.t(:account)
     .row{"data-hook" => "customer_fields"}
-      .alpha.eight.columns
+      .alpha.eight.columns.fullwidth
         .field
           = f.label :email, Spree.t(:email) + ':'
           = f.email_field :email, :class => 'fullwidth'
-      .omega.four.columns
-        .field
-          = label_tag nil, Spree.t(:guest_checkout)
-          \:
-          %ul
-            - if @order.completed?
-              %li
-                = @order.user.nil? ? Spree.t(:say_yes) : Spree.t(:say_no)
-            - else
-              - guest = @order.user.nil? || @order.user.anonymous?
-              %li
-                = radio_button_tag :guest_checkout, true, guest
-                = Spree.t(:say_yes)
-              %li
-                = radio_button_tag :guest_checkout, false, !guest, :disabled => @order.cart?
-                = Spree.t(:say_no)
-              = hidden_field_tag :user_id, @order.user_id
 
   .alpha.six.columns{"data-hook" => "bill_address_wrapper"}
     %fieldset.no-border-bottom