More Work on UserController