UserRepository fixes