Fix selected users when org is removed