Index: /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/interfaces.py
===================================================================
--- /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/interfaces.py	(revision 17743)
+++ /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/interfaces.py	(revision 17744)
@@ -31,5 +31,8 @@
 from waeup.kofa.schoolgrades import ResultEntryField
 from waeup.kofa.students.vocabularies import nats_vocab, GenderSource
-from waeup.kofa.applicants.interfaces import contextual_reg_num_source
+from waeup.kofa.applicants.interfaces import (
+    contextual_reg_num_source,
+    contextual_email_source,
+    IApplicantRegisterUpdate)
 from kofacustom.nigeria.applicants.interfaces import (
     LGASource, high_qual, high_grade, exam_types,
@@ -158,8 +161,9 @@
         )
 
-    email = schema.ASCIILine(
+    email = TextLineChoice(
         title = _(u'Email Address'),
         required = True,
         constraint=validate_email,
+        source = contextual_email_source,
         )
 
@@ -243,8 +247,9 @@
         )
 
-    email = schema.ASCIILine(
+    email = TextLineChoice(
         title = _(u'Email Address'),
         required = True,
         constraint=validate_email,
+        source = contextual_email_source,
         )
 
@@ -286,4 +291,11 @@
     adding them to the OMIT* tuples.
     """
+
+    email = TextLineChoice(
+        title = _(u'Email Address'),
+        required = True,
+        constraint=validate_email,
+        source = contextual_email_source,
+        )
 
     nationality = schema.Choice(
@@ -456,4 +468,6 @@
         )
 
+ICustomUGApplicant[
+    'email'].order =  INigeriaUGApplicant['email'].order
 
 class ICustomPGApplicant(INigeriaPGApplicant):
@@ -464,4 +478,14 @@
     adding them to the PG_OMIT* tuples.
     """
+
+    email = TextLineChoice(
+        title = _(u'Email Address'),
+        required = True,
+        constraint=validate_email,
+        source = contextual_email_source,
+        )
+
+ICustomPGApplicant[
+    'email'].order =  INigeriaPGApplicant['email'].order
 
 class ICustomApplicant(ICustomUGApplicant, ICustomPGApplicant,
@@ -497,9 +521,9 @@
     """
 
-
-    email = schema.ASCIILine(
+    email = TextLineChoice(
         title = _(u'Email Address'),
         required = True,
         constraint=validate_email,
+        source = contextual_email_source,
         )
     date_of_birth = FormattedDate(
@@ -539,8 +563,9 @@
     """
 
-    email = schema.ASCIILine(
+    email = TextLineChoice(
         title = _(u'Email Address'),
         required = True,
         constraint=validate_email,
+        source = contextual_email_source,
         )
     date_of_birth = FormattedDate(
@@ -580,2 +605,15 @@
     """
 
+class ICustomApplicantRegisterUpdate(IApplicantRegisterUpdate):
+    """This is a representation of an applicant for first-time registration.
+    This interface is used when applicants use the registration page to
+    update their records.
+    """
+
+    email = TextLineChoice(
+        title = _(u'Email Address'),
+        required = False,
+        constraint=validate_email,
+        source = contextual_email_source,
+        )
+
