Small changes to UserController