diff --git a/app/views/spree/admin/users/_api_fields.html.erb b/app/views/spree/admin/users/_api_fields.html.erb
deleted file mode 100644
index dd3ac7791f..0000000000
--- a/app/views/spree/admin/users/_api_fields.html.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-<fieldset data-hook="admin_user_api_key" class="omega six columns">
-  <legend><%= Spree.t('access', :scope => 'api') %></legend>
-
-  <% if @user.spree_api_key.present? %>
-    <div class="field">
-      <%= label_tag Spree.t('key', :scope => 'api') %>:
-      <%= @user.spree_api_key %>
-    </div>
-    <div class="filter-actions actions">
-      <%= form_tag spree.clear_api_key_admin_user_path(@user), :method => :put do %>
-        <%= button Spree.t('clear_key', :scope => 'api'), 'icon-trash' %>
-      <% end %>
-
-      <span class="or"><%= Spree.t(:or)%></span>
-
-      <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
-        <%= button Spree.t('regenerate_key', :scope => 'api'), 'icon-refresh' %>
-      <% end %>
-    </div>
-
-  <% else %>
-
-    <div class="no-objects-found"><%= Spree.t('no_key', :scope => 'api') %></div>
-
-    <div class="filter-actions actions">
-      <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
-        <%= button Spree.t('generate_key', :scope => 'api'), 'icon-key' %>
-      <% end %>
-    </div>
-  <% end %>
-</fieldset>
diff --git a/app/views/spree/admin/users/_api_fields.html.haml b/app/views/spree/admin/users/_api_fields.html.haml
new file mode 100644
index 0000000000..056f576f7e
--- /dev/null
+++ b/app/views/spree/admin/users/_api_fields.html.haml
@@ -0,0 +1,18 @@
+%fieldset.omega.six.columns
+  %legend= Spree.t('access', :scope => 'api')
+  - if @user.spree_api_key.present?
+    .field
+      = label_tag Spree.t('key', :scope => 'api')
+      = ":"
+      = @user.spree_api_key
+    .filter-actions.actions
+      = form_tag spree.clear_api_key_admin_user_path(@user), method: :put do
+        = button Spree.t('clear_key', :scope => 'api'), 'icon-trash'
+      %span.or= Spree.t(:or)
+      = form_tag spree.generate_api_key_admin_user_path(@user), method: :put do
+        = button Spree.t('regenerate_key', :scope => 'api'), 'icon-refresh'
+  - else
+    .no-objects-found= Spree.t('no_key', :scope => 'api')
+    .filter-actions.actions
+      = form_tag spree.generate_api_key_admin_user_path(@user), method: :put do
+        = button Spree.t('generate_key', :scope => 'api'), 'icon-key'