BZ-8867 fix the intermittent avatar