User rights merging fixes