Regression after updating template.xml from blue_eagle
Reogarnise code to be able to pre-load avatars from integration