Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py	(revision 8606)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py	(revision 8607)
@@ -79,7 +79,24 @@
 
 class AppCatCertificateSource(CertificateSource):
-    """An application certificate source delivers all courses which belong to
-    a certain application_category.
-    """
+    """An application certificate source delivers all certificates
+    which belong to a certain application_category.
+
+    This source is meant to be used with Applicants.
+
+    The application category must match the application category of
+    the context parent, normally an applicants container.
+    """
+    def contains(self, context, value):
+        context_appcat = getattr(getattr(
+            context, '__parent__', None), 'application_category', None)
+        if context_appcat is None:
+            # If the context (applicant) has no application category,
+            # then it might be not part of a container (yet), for
+            # instance during imports. We consider this correct.
+            return True
+        if value.application_category == context_appcat:
+            return True
+        return False
+
     def getValues(self, context):
         # appliction category not available when certificate was deleted.
@@ -92,4 +109,5 @@
             application_category=(appcat,appcat))
         result = sorted(result, key=lambda value: value.code)
+        # XXX: What does the following mean here?
         curr_course = context.course1
         if curr_course is not None and curr_course not in result:
