diff --git a/app/views/spree/admin/users/_form.html.erb b/app/views/spree/admin/users/_form.html.erb
index d643155b0c..ab7146659a 100644
--- a/app/views/spree/admin/users/_form.html.erb
+++ b/app/views/spree/admin/users/_form.html.erb
@@ -1,35 +1,53 @@
 <div data-hook="admin_user_form_fields" class="row">
   <div class="col-12 col-md-6">
     <%= f.field_container :email do %>
-      <%= f.label :email, Spree.t(:email) %>
-      <%= f.email_field :email, class: 'form-control' %>
+      <%= f.label :email, raw(Spree.t(:email) + required_span_tag) %>
+      <%= f.email_field :email, class: 'form-control', required: true %>
       <%= f.error_message_on :email %>
     <% end %>
+  </div>
 
-    <div data-hook="admin_user_form_roles" class="form-group">
-      <strong><%= Spree.t(:roles) %></strong>
-      <%= f.collection_check_boxes :spree_role_ids, Spree::Role.all, :id, :name do |role_form| %>
-        <div class="checkbox">
-          <%= role_form.label for: "user_spree_role_#{role_form.object.name}" do %>
-            <%= role_form.check_box id: "user_spree_role_#{role_form.object.name}" %>
-            <%= role_form.object.name %>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
+  <div data-hook="admin_user_form_roles" class="col-12 col-md-6 form-group">
+    <strong><%= Spree.t(:roles) %></strong>
+    <%= f.collection_check_boxes :spree_role_ids, Spree::Role.all, :id, :name do |role_form| %>
+      <div class="checkbox">
+        <%= role_form.label for: "user_spree_role_#{role_form.object.name}" do %>
+          <%= role_form.check_box id: "user_spree_role_#{role_form.object.name}" %>
+          <%= role_form.object.name %>
+        <% end %>
+      </div>
+    <% end %>
   </div>
 
-  <div data-hook="admin_user_form_password_fields" class="col-12 col-md-6">
+  <div class="col-12 col-md-6">
     <%= f.field_container :password do %>
       <%= f.label :password, Spree.t(:password) %>
-      <%= f.password_field :password, class: 'form-control' %>
+      <%= f.password_field :password, class: 'form-control', required: true %>
       <%= f.error_message_on :password %>
     <% end %>
+  </div>
 
+  <div class="col-12 col-md-6">
     <%= f.field_container :password_confirmation do %>
       <%= f.label :password_confirmation, Spree.t(:confirm_password) %>
-      <%= f.password_field :password_confirmation, class: 'form-control' %>
+      <%= f.password_field :password_confirmation, class: 'form-control', required: true %>
       <%= f.error_message_on :password_confirmation %>
     <% end %>
   </div>
+
+  <div class="col-12 col-md-6">
+    <%= f.field_container :first_name do %>
+      <%= f.label :first_name, Spree.t(:first_name) %>
+      <%= f.text_field :first_name, class: 'form-control' %>
+      <%= f.error_message_on :first_name %>
+    <% end %>
+  </div>
+
+  <div class="col-12 col-md-6">
+    <%= f.field_container :last_name do %>
+      <%= f.label :last_name, Spree.t(:last_name) %>
+      <%= f.text_field :last_name, class: 'form-control' %>
+      <%= f.error_message_on :last_name %>
+    <% end %>
+  </div>
 </div>
diff --git a/spec/features/admin/users_spec.rb b/spec/features/admin/users_spec.rb
index 945b527571..abfb3d1c73 100644
--- a/spec/features/admin/users_spec.rb
+++ b/spec/features/admin/users_spec.rb
@@ -183,6 +183,17 @@
       expect(page).to have_checked_field('user_spree_role_admin')
     end
 
+    it 'can edit first and last name' do
+      fill_in 'user_first_name', with: 'John'
+      fill_in 'user_last_name', with: 'Doe'
+      click_button 'Update'
+
+      expect(page).to have_text 'Account updated'
+      user_a.reload
+      expect(user_a.first_name).to eq 'John'
+      expect(user_a.last_name).to eq 'Doe'
+    end
+
     it 'can edit user shipping address' do
       click_link 'Addresses'