Better handle the new payment statuses in unregistration