Index: /main/waeup.futminna/trunk/src/waeup/futminna/applicants/interfaces.py
===================================================================
--- /main/waeup.futminna/trunk/src/waeup/futminna/applicants/interfaces.py	(revision 10216)
+++ /main/waeup.futminna/trunk/src/waeup/futminna/applicants/interfaces.py	(revision 10217)
@@ -20,4 +20,5 @@
 
 from zope import schema
+from zope.interface import Attribute, invariant, Invalid
 from waeup.kofa.applicants.interfaces import (
     IApplicantBaseData,
@@ -41,6 +42,11 @@
     PUTME_OMIT_PDF_FIELDS,
     PUTME_OMIT_MANAGE_FIELDS,
-    PUTME_OMIT_EDIT_FIELDS,
+    PUTME_OMIT_FIELDS,
+    #PUTME_OMIT_EDIT_FIELDS,
     )
+
+PUTME_OMIT_EDIT_FIELDS = UG_OMIT_EDIT_FIELDS + PUTME_OMIT_FIELDS + (
+    'firstname', 'middlename', 'lastname', 'sex',
+    'lga')
 
 PG_OMIT_DISPLAY_FIELDS = OMIT_DISPLAY_FIELDS + ('course2',)
@@ -83,7 +89,6 @@
     course2 = schema.Choice(
         title = _(u'2nd Choice Course of Study'),
-        description = _(u'Comment which explains why applicant must select a 2nd Choice Course of Study.'),
-        source = AppCatCertificateSource(),
-        required = True,
+        source = AppCatCertificateSource(),
+        required = False,
         )
     hq_type = schema.Choice(
@@ -167,4 +172,8 @@
         )
 
+    @invariant
+    def second_choice(applicant):
+        if applicant.course1 == applicant.course2:
+            raise Invalid(_("2nd choice course must differ from 1st choice course."))
 
 class ICustomPGApplicant(IApplicantBaseData):
@@ -259,4 +268,18 @@
     """
 
+    course1 = schema.Choice(
+        title = _(u'1st Choice Course of Study'),
+        source = AppCatCertificateSource(),
+        required = True,
+        readonly = True,
+        )
+
+    course2 = schema.Choice(
+        title = _(u'2nd Choice Course of Study'),
+        description = _(u'Comment which explains why applicant must select a 2nd Choice Course of Study.'),
+        source = AppCatCertificateSource(),
+        required = True,
+        )
+
 class ICustomPGApplicantEdit(ICustomPGApplicant):
     """A postgraduate applicant interface for editing.
