UserService improvement