Fix for Show Avatars disabled, issue #518

This is ready for review and merge, @fjarrett / @lukecarbis.