Fix bug with removing users