HAL-64: Bugfix when modifying (scoped) roles