Refactor user to not be observable.