Fix bug where user could leave organization