long evil double-avatar bug fixed here. Probable fix for CURRIKI-6321 and maybe CURRIKI-5943.
paul