Only provide avatar key when present