Updated to reflect spree_user changes in 1.3