Adding back support for avatar setting

T’was accidentally removed whilst cleaning up the code. ^.^’