UserController edited