UserService, NetworkService changes