Allow proper handling of user removal