Renamed current_user to spree_current_user