minor fix in UserController
merge conflicts