Reverted back to Spree::User