better avatar and gravatar handling