Fixes #1228 Broken avatars
Fixes #1228 Broken avatars #1258

Added missed places.
Merge pull request #1258 from Sama34/fix-1228

Fixes #1228 Broken avatars