diff --git a/app/controllers/spree/users_controller_decorator.rb b/app/controllers/spree/users_controller_decorator.rb
new file mode 100644
index 0000000000..5f0eaa9759
--- /dev/null
+++ b/app/controllers/spree/users_controller_decorator.rb
@@ -0,0 +1,3 @@
+Spree::UsersController.class_eval do
+  layout 'darkswarm'
+end
diff --git a/app/views/spree/users/edit.html.haml b/app/views/spree/users/edit.html.haml
new file mode 100644
index 0000000000..9815b5f34d
--- /dev/null
+++ b/app/views/spree/users/edit.html.haml
@@ -0,0 +1,8 @@
+.darkswarm
+  .row
+    = render :partial => 'spree/shared/error_messages', :locals => { :target => @user }
+    %h1= t(:editing_user)
+    = form_for Spree::User.new, :as => @user, :url => spree.user_path(@user), :method => :put do |f|
+      = render :partial => 'spree/shared/user_form', :locals => { :f => f }
+      %p
+        = f.submit t(:update), :class => 'button primary'
diff --git a/app/views/spree/users/show.html.haml b/app/views/spree/users/show.html.haml
new file mode 100644
index 0000000000..49db903a14
--- /dev/null
+++ b/app/views/spree/users/show.html.haml
@@ -0,0 +1,33 @@
+.darkswarm
+  .row
+    %h1= accurate_title
+    .account-summary{"data-hook" => "account_summary"}
+      %dl#user-info
+        %dt= t(:email)
+        %dd
+          = @user.email
+          (#{link_to t(:edit), spree.edit_account_path})
+    .account-my-orders{"data-hook" => "account_my_orders"}
+      %h3= t(:my_orders)
+      - if @orders.present?
+        %table.order-summary
+          %thead
+            %tr
+              %th.order-number= t(:order_number)
+              %th.order-date= t(:order_date)
+              %th.order-status= t(:status)
+              %th.order-payment-state= t(:payment_state)
+              %th.order-shipment-state= t(:shipment_state)
+              %th.order-total= t(:total)
+          %tbody
+            - @orders.each do |order|
+              %tr{class: cycle('even', 'odd')}
+                %td.order-number= link_to order.number, order_url(order)
+                %td.order-date= l order.completed_at.to_date
+                %td.order-status= t(order.state).titleize
+                %td.order-payment-state= t("payment_states.#{order.payment_state}") if order.payment_state
+                %td.order-shipment-state= t("shipment_states.#{order.shipment_state}") if order.shipment_state
+                %td.order-total= money order.total
+      - else
+        %p= t(:you_have_no_orders_yet)
+      %br/