No broken avatars

Remake of #2357.