UserService fixed