Fix for Show Avatars disabled, issue #518

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