updated issues with user and company avatars