Update to passport user profile convention

Add support for user profile convention and removed most of the confusing scope bindings.