- add_role, remove_role: fix case when role is already set/no longer set