diff --git a/registrasion/controllers/invoice.py b/registrasion/controllers/invoice.py
index 616f418d..2c69faed 100644
--- a/registrasion/controllers/invoice.py
+++ b/registrasion/controllers/invoice.py
@@ -43,16 +43,16 @@ class InvoiceController(ForId, object):
             cart_controller = CartController(cart)
             cart_controller.validate_cart()  # Raises ValidationError on fail.
 
-            cls.void_all_invoices(cart)
+            cls.update_old_invoices(cart)
             invoice = cls._generate(cart)
 
         return cls(invoice)
 
     @classmethod
-    def void_all_invoices(cls, cart):
+    def update_old_invoices(cls, cart):
         invoices = commerce.Invoice.objects.filter(cart=cart).all()
         for invoice in invoices:
-            cls(invoice).void()
+            cls(invoice).update_status()
 
     @classmethod
     def resolve_discount_value(cls, item):
@@ -299,7 +299,11 @@ class InvoiceController(ForId, object):
     def update_validity(self):
         ''' Voids this invoice if the cart it is attached to has updated. '''
         if not self._invoice_matches_cart():
-            self.void()
+            if self.total_payments() > 0:
+                # Free up the payments made to this invoice
+                self.refund()
+            else:
+                self.void()
 
     def void(self):
         ''' Voids the invoice if it is valid to do so. '''
diff --git a/registrasion/tests/test_invoice.py b/registrasion/tests/test_invoice.py
index 57e51adc..6d36d082 100644
--- a/registrasion/tests/test_invoice.py
+++ b/registrasion/tests/test_invoice.py
@@ -564,19 +564,20 @@ class InvoiceTestCase(RegistrationCartTestCase):
         cart.add_to_cart(self.PROD_1, 1)
         invoice = TestingInvoiceController.for_id(invoice.invoice.id)
         invoice2 = TestingInvoiceController.for_cart(cart.cart)
+        cn2 = self._credit_note_for_invoice(invoice.invoice)
 
         invoice._refresh()
 
         # The first invoice should be refunded
         self.assertEquals(
-            commerce.invoice.STATUS_REFUNDED,
+            commerce.Invoice.STATUS_VOID,
             invoice.invoice.status,
         )
 
-        # The credit note should be equal to the payments value of first inv
+        # Both credit notes should be for the same amount
         self.assertEquals(
             cn.credit_note.value,
-            invoice.total_payments(),
+            cn2.credit_note.value,
         )
 
     def test_sends_email_on_invoice_creation(self):