Use a uid@provider syntax

provider?uid was confusing.  uid@provider is more common and is more readable