Update AWS Console SP to only use persistent nameid