Merge pull request #6633 from SvenDowideit/avoid-extra-gravatar-download

Lets not download the gravatar and then download a different one after t...