modified userservice