Updated to support using JWT for Account Context