diff --git a/lib/builder.rb b/lib/builder.rb
index 7e537dab..8cc04a0e 100644
--- a/lib/builder.rb
+++ b/lib/builder.rb
@@ -347,8 +347,7 @@ class CustomWizard::Builder
     end
 
     if custom_fields.present?
-      custom_fields.each { |k, v| user.custom_fields[k] = v }
-      user.save_custom_fields(true)
+      attributes[:custom_fields] = custom_fields
     end
 
     if attributes.present?