diff --git a/app/controllers/admin/registrations_controller.rb b/app/controllers/admin/registrations_controller.rb
index 7f80297c..9c60ca14 100644
--- a/app/controllers/admin/registrations_controller.rb
+++ b/app/controllers/admin/registrations_controller.rb
@@ -14,8 +14,7 @@ module Admin
     def edit; end
 
     def update
-      @user.update_attributes(registration_params[:user_attributes])
-      params[:registration].delete :user_attributes
+      @user.update_attributes(user_params)
 
       @registration.update_attributes(registration_params)
       if @registration.save
@@ -54,11 +53,14 @@ module Admin
       @user = User.find_by(id: @registration.user_id)
     end
 
+    def user_params
+      params.require(:user).permit(:name, :nickname, :affiliation)
+    end
+
     def registration_params
       params.require(:registration).permit(:user_id, :conference_id, :arrival, :departure, :attended,
                                            :volunteer, :other_special_needs,
-                                           vchoice_ids: [], qanswer_ids: [], qanswers_attributes: [], event_ids: [],
-                                           user_attributes: [:nickname, :name, :affiliation, :tshirt, :mobile, :volunteer_experience, :languages])
+                                           vchoice_ids: [], qanswer_ids: [], qanswers_attributes: [], event_ids: [])
     end
   end
 end
diff --git a/app/views/admin/registrations/edit.html.haml b/app/views/admin/registrations/edit.html.haml
index 88450883..b9b99769 100644
--- a/app/views/admin/registrations/edit.html.haml
+++ b/app/views/admin/registrations/edit.html.haml
@@ -9,7 +9,7 @@
   .col-md-6
     = semantic_form_for(@registration, url: admin_conference_registration_path(@conference.short_title, @registration)) do |f|
       = f.inputs 'Personal Information' do
-        = f.fields_for :user do |u|
+        = semantic_fields_for  :user do |u|
           = u.input :name, as: :string
           = u.input :nickname, as: :string
           = u.input :affiliation, placeholder: 'Company/User Group/nothing', as: :string