Refactor user address to not be observable.