Update the ContextService to work with the AccountId rather than the ProviderId