Fixed so that users can be removed (includes change in the DB also)