diff --git a/app/views/spree/admin/users/edit.html.erb b/app/views/spree/admin/users/edit.html.erb
deleted file mode 100644
index 1dccf3bb38..0000000000
--- a/app/views/spree/admin/users/edit.html.erb
+++ /dev/null
@@ -1,28 +0,0 @@
- <% content_for :page_title do %>
- <%= Spree.t(:editing_user) %>
- <% end %>
-
- <% content_for :page_actions do %>
-
- <%= button_link_to Spree.t(:back_to_users_list), spree.admin_users_path, :icon => 'icon-arrow-left' %>
-
- <% end %>
-
-
\ No newline at end of file
diff --git a/app/views/spree/admin/users/edit.html.haml b/app/views/spree/admin/users/edit.html.haml
new file mode 100644
index 0000000000..93ef949000
--- /dev/null
+++ b/app/views/spree/admin/users/edit.html.haml
@@ -0,0 +1,14 @@
+- content_for :page_title do
+ = Spree.t(:editing_user)
+- content_for :page_actions do
+ %li
+ = button_link_to Spree.t(:back_to_users_list), spree.admin_users_path, icon: "icon-arrow-left"
+%fieldset.alpha.ten.columns{"data-hook" => "admin_user_edit_general_settings"}
+ %legend= Spree.t(:general_settings)
+ %div{"data-hook" => "admin_user_edit_form_header"}
+ = render partial: "spree/shared/error_messages", locals: { target: @user }
+ %div{"data-hook" => "admin_user_edit_form"}
+ = form_for [:admin, @user] do |f|
+ = render partial: "form", locals: { f: f }
+ %div{"data-hook" => "admin_user_edit_form_button"}
+ = render partial: "spree/admin/shared/edit_resource_links"