Replace Provider with User where appropriate