Remove flicker from role change