Fixed overriding avatar settings