Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/interfaces.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/interfaces.py	(revision 7208)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/interfaces.py	(revision 7209)
@@ -248,5 +248,5 @@
         source = CertificateSource(),
         default = None,
-        required = True,
+        required = False,
         )
 
Index: /main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.py	(revision 7208)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.py	(revision 7209)
@@ -19,4 +19,5 @@
 """
 import grok
+from zope.event import notify
 from zope.catalog.interfaces import ICatalog
 from zope.component import getUtility
@@ -113,2 +114,27 @@
     def getInterfaces(self):
         return implementedBy(CertificateCourse)
+
+@grok.subscribe(ICertificate, grok.IObjectRemovedEvent)
+def handle_certificate_removed(certificate, event):
+    """If a certificate is deleted, we make sure that also referrers to
+    student studycourse objects are removed.
+    """
+    code = certificate.code
+
+    # Find all student studycourses that refer to given certificate...
+    try:
+        cat = getUtility(ICatalog, name='students_catalog')
+    except ComponentLookupError:
+        # catalog not available. This might happen during tests.
+        return
+
+    results = cat.searchResults(certcode=(code, code))
+    for student in results:
+        # Remove that referrer...
+        studycourse = student['studycourse']
+        studycourse.certificate = None
+        notify(grok.ObjectModifiedEvent(student))
+        event_name = event.__implemented__.__name__.replace(
+            'zope.lifecycleevent.','')
+        student.loggerInfo(event_name, 'removed: certificate')
+    return
