This fix several issues related to avatars (refs #637), but will need some design love
Merge pull request #958 from capooti/issue-637

This fix several issues related to avatars (refs #637), but will need some design love