Avatar compatibility improvements

Why are you giving the `user` an `avatar` at this point?