diff --git a/app/views/spree/admin/users/_api_fields.html.erb b/app/views/spree/admin/users/_api_fields.html.erb
new file mode 100644
index 0000000000..dd3ac7791f
--- /dev/null
+++ b/app/views/spree/admin/users/_api_fields.html.erb
@@ -0,0 +1,31 @@
+<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/edit.html.haml b/app/views/spree/admin/users/edit.html.haml
index b192342306..78304b663c 100644
--- a/app/views/spree/admin/users/edit.html.haml
+++ b/app/views/spree/admin/users/edit.html.haml
@@ -13,3 +13,5 @@
       = render partial: "form", locals: { f: f }
       %div{"data-hook" => "admin_user_edit_form_button"}
         = render partial: "spree/admin/shared/edit_resource_links"
+
+= render partial: 'spree/admin/users/api_fields'