Fixes #1228 Broken avatars #1258

Added missed places.