diff --git a/app/views/spree/admin/_users_tab.html.erb b/app/views/spree/admin/_users_tab.html.erb
deleted file mode 100644
index 5b3ffc9e60..0000000000
--- a/app/views/spree/admin/_users_tab.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% if can? :admin, Spree::User %>
-  <%= tab(:users, :url => spree.admin_users_path, :icon => 'icon-user') %>
-<% end %>
diff --git a/app/views/spree/admin/_users_tab.html.haml b/app/views/spree/admin/_users_tab.html.haml
new file mode 100644
index 0000000000..8be1861f50
--- /dev/null
+++ b/app/views/spree/admin/_users_tab.html.haml
@@ -0,0 +1,2 @@
+- if can? :admin, Spree::User
+  = tab(:users, url: spree.admin_users_path, icon: 'icon-user')
diff --git a/app/views/spree/admin/users/new.html.erb b/app/views/spree/admin/users/new.html.erb
deleted file mode 100644
index 9891bce060..0000000000
--- a/app/views/spree/admin/users/new.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:new_user) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_users_list), spree.admin_users_path, :icon => 'icon-arrow-left' %>
-  </li>
-<% end %>
-
-<div data-hook="admin_user_new_form_header">
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
-</div>
-
-<div data-hook="admin_user_new_form">
-  <%= form_for [:admin, @user] do |f| %>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-
-    <div data-hook="admin_user_new_form_buttons">
-      <%= render :partial => 'spree/admin/shared/new_resource_links' %>
-    </div>
-  <% end %>
-</div>
diff --git a/app/views/spree/admin/users/new.html.haml b/app/views/spree/admin/users/new.html.haml
new file mode 100644
index 0000000000..9fb68e689f
--- /dev/null
+++ b/app/views/spree/admin/users/new.html.haml
@@ -0,0 +1,15 @@
+= content_for :page_title do
+  = Spree.t(:new_user)
+
+= content_for :page_actions do
+  %li
+    = button_link_to Spree.t(:back_to_users_list), spree.admin_users_path, icon: 'icon-arrow-left'
+
+%div
+  = render partial: 'spree/shared/error_messages', locals: { target: @user }
+
+%div
+  = form_for [:admin, @user] do |f|
+    = render partial: 'form', locals: { f: f }
+    %div
+      = render partial: 'spree/admin/shared/new_resource_links'
diff --git a/app/views/spree/shared/_user_form.html.erb b/app/views/spree/shared/_user_form.html.erb
deleted file mode 100644
index a31902ca61..0000000000
--- a/app/views/spree/shared/_user_form.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<p>
-  <%= f.label :email, Spree.t(:email) %><br />
-  <%= f.email_field :email, :class => 'title' %>
-</p>
-<div id="password-credentials">
-  <p>
-    <%= f.label :password, Spree.t(:password) %><br />
-    <%= f.password_field :password, :class => 'title' %>
-  </p>
-
-  <p>
-    <%= f.label :password_confirmation, Spree.t(:confirm_password) %><br />
-    <%= f.password_field :password_confirmation, :class => 'title' %>
-  </p>
-</div>
-
-<div data-hook="signup_below_password_fields"></div>
diff --git a/app/views/spree/shared/_user_form.html.haml b/app/views/spree/shared/_user_form.html.haml
new file mode 100644
index 0000000000..ddee06e421
--- /dev/null
+++ b/app/views/spree/shared/_user_form.html.haml
@@ -0,0 +1,15 @@
+%p
+  = f.label :email, Spree.t(:email)
+  %br
+  = f.email_field :email, class: 'title'
+
+%div{"id" => "password-credentials"}
+  %p
+    = f.label :password, Spree.t(:password)
+    %br
+    = f.password_field :password, class: 'title'
+
+  %p
+    = f.label :password_confirmation, Spree.t(:confirm_password)
+    %br
+    = f.password_field :password_confirmation, class: 'title'
diff --git a/app/views/spree/user_passwords/new.html.erb b/app/views/spree/user_passwords/new.html.erb
deleted file mode 100755
index a4330e4490..0000000000
--- a/app/views/spree/user_passwords/new.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user } %>
-
-<div id="forgot-password">
-  <h6><%= Spree.t(:forgot_password) %></h6>
-
-  <p><%= Spree.t(:instructions_to_reset_password) %></p>
-
-  <%= form_for Spree::User.new, :as => :spree_user, :url => spree.reset_password_path do |f| %>
-    <p>
-      <%= f.label :email, Spree.t(:email) %><br />
-      <%= f.email_field :email %>
-    </p>
-    <p>
-      <%= f.submit Spree.t(:reset_password), :class => 'button primary' %>
-    </p>
-  <% end %>
-</div>
diff --git a/app/views/spree/user_passwords/new.html.haml b/app/views/spree/user_passwords/new.html.haml
new file mode 100755
index 0000000000..604f7ebf8c
--- /dev/null
+++ b/app/views/spree/user_passwords/new.html.haml
@@ -0,0 +1,14 @@
+= render partial: 'spree/shared/error_messages', locals: { target: @spree_user }
+
+%div{"id" => "forgot-password"}
+  %h6= Spree.t(:forgot_password)
+
+  %p= Spree.t(:instructions_to_reset_password)
+
+  = form_for Spree::User.new, as: :spree_user, url: spree.reset_password_path do |f|
+    %p
+      = f.label :email, Spree.t(:email)
+      %br
+      = f.email_field :email
+    %p
+      = f.submit Spree.t(:reset_password), class: 'button primary'