Fix avatar dialog issues (part 2)