Use new Account Gateway headers