Pulling AVATAR_GRAVATAR_FIELD improvement

I reviewed the code, looks good to me.