Index: /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/batching.py
===================================================================
--- /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/batching.py	(revision 17358)
+++ /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/batching.py	(revision 17359)
@@ -36,6 +36,4 @@
         """
         result = super(CustomApplicantProcessor, self).required_fields
-        result.remove('subj_comb')
-        result.remove('school')
         return result
 
Index: /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/browser.py
===================================================================
--- /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/browser.py	(revision 17358)
+++ /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/browser.py	(revision 17359)
@@ -188,4 +188,6 @@
             form_fields['lga'].for_display = True
             form_fields['matric_number'].for_display = True
+            form_fields['subj_comb'].field.required = True
+            form_fields['school_tpu'].field.required = True
             return form_fields
         if target == 'utp':
@@ -199,4 +201,6 @@
             form_fields['lga'].for_display = True
             form_fields['matric_number'].for_display = True
+            form_fields['subj_comb'].field.required = True
+            form_fields['school_utp'].field.required = True
             return form_fields
         form_fields = grok.AutoFields(ICustomUGApplicantEdit)
Index: /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/interfaces.py
===================================================================
--- /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/interfaces.py	(revision 17358)
+++ /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/interfaces.py	(revision 17359)
@@ -185,5 +185,5 @@
         title = _(u'Subject Combination'),
         source = TPUCertificateSource(),
-        required = True,
+        required = False,
         )
 
@@ -191,5 +191,5 @@
         title = _(u'1st Choice TPZ and School'),
         source = TPUSchoolSource(),
-        required = True,
+        required = False,
         )
 
@@ -270,5 +270,5 @@
         title = _(u'Subject Combination'),
         source = UTPCertificateSource(),
-        required = True,
+        required = False,
         )
 
@@ -276,5 +276,5 @@
         title = _(u'1st Choice UTP and School'),
         source = UTPSchoolSource(),
-        required = True,
+        required = False,
         )
 
