Fixed avatar change/add