modified UserService, UserDao