Index: /main/kofacustom.dspg/trunk/src/kofacustom/dspg/applicants/browser.py
===================================================================
--- /main/kofacustom.dspg/trunk/src/kofacustom/dspg/applicants/browser.py	(revision 16725)
+++ /main/kofacustom.dspg/trunk/src/kofacustom/dspg/applicants/browser.py	(revision 16726)
@@ -238,5 +238,7 @@
     @property
     def form_fields(self):
-        if self.target in ('conv', 'special', 'hndfincl', 'ndfincl'):
+        if self.context.special:
+            return grok.AutoFields(ICustomSpecialApplicant)
+        if self.target in ('conv', 'hndfincl', 'ndfincl'):
             form_fields = grok.AutoFields(ICustomSpecialApplicant)
             form_fields = form_fields.omit(
Index: /main/kofacustom.dspg/trunk/src/kofacustom/dspg/applicants/interfaces.py
===================================================================
--- /main/kofacustom.dspg/trunk/src/kofacustom/dspg/applicants/interfaces.py	(revision 16725)
+++ /main/kofacustom.dspg/trunk/src/kofacustom/dspg/applicants/interfaces.py	(revision 16726)
@@ -29,4 +29,5 @@
 from waeup.kofa.schema import FormattedDate, TextLineChoice, PhoneNumber
 from waeup.kofa.students.vocabularies import nats_vocab, GenderSource
+from waeup.kofa.university.vocabularies import CourseSource
 from waeup.kofa.applicants.interfaces import (
     contextual_reg_num_source, ISpecialApplicant)
@@ -302,13 +303,37 @@
         )
 
-    carryover_courses_1 = schema.Text(
-        title = _(u'1st Semseter Carry-Over Courses'),
-        required = False,
-        )
-
-    carryover_courses_2 = schema.Text(
+    carryover_courses_1 = schema.List(
+        title = _(u'1st Semester Carry-Over Courses'),
+        value_type = schema.Choice(
+            #title = _(u'YYY'),
+            source = CourseSource(),
+            required = True,
+            ),
+        required = False,
+        readonly = False,
+        defaultFactory=list,
+        )
+
+    carryover_courses_2 = schema.List(
         title = _(u'2nd Semester Carry-Over Courses'),
-        required = False,
-        )
+        value_type = schema.Choice(
+            #title = _(u'YYY'),
+            source = CourseSource(),
+            required = True,
+            ),
+        required = False,
+        readonly = False,
+        defaultFactory=list,
+        )
+
+    #carryover_courses_1 = schema.Text(
+    #    title = _(u'1st Semseter Carry-Over Courses'),
+    #    required = False,
+    #    )
+
+    #carryover_courses_2 = schema.Text(
+    #    title = _(u'2nd Semester Carry-Over Courses'),
+    #    required = False,
+    #    )
 
 class ICustomApplicant(ICustomUGApplicant, ICustomPGApplicant,
