Further work on the UserController.