Merge "Allow adding a user while still removing other users"