These are now in user_controller