Avatar compatibility improvements

Because we have now added the ability for staff users to POST