MDL-38320 fix role name display when roles switched