added avatar support for switcher user, wherever found