Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 6468)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 6469)
@@ -40,5 +40,6 @@
 from reportlab.platypus.tables import TableStyle
 
-from waeup.sirp.accesscodes import invalidate_accesscode
+from waeup.sirp.accesscodes import invalidate_accesscode, get_access_code
+from waeup.sirp.accesscodes.workflow import USED
 from waeup.sirp.browser import (
     WAeUPPage, WAeUPEditFormPage, WAeUPAddFormPage, WAeUPDisplayFormPage)
@@ -425,6 +426,11 @@
 
         # Mark pin as used (this also fires a pin related transition)
-        comment = u"Invalidated by applicant"
-        invalidate_accesscode(pin, comment)
+        if get_access_code(pin).status == USED:
+            pass
+        else:
+            comment = u"Invalidated by applicant"
+            # Here we know that the ac is in state initialized so we do not
+            # expect an exception
+            invalidate_accesscode(pin, comment)
 
         if not pin in self.context.keys():
