Fixes to how no-Gravatar setups are handled