Index: /main/waeup.sirp/trunk/src/waeup/sirp/jambtables/authentication.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/jambtables/authentication.py	(revision 5463)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/jambtables/authentication.py	(revision 5464)
@@ -52,6 +52,4 @@
     grok.implements(IApplicantPrincipalInfo)
 
-    # def __init__(self, id, title, description):
-    # def __init__(self, reg_no, access_code):
     def __init__(self, access_code, jamb_reg_no=None):
         self.id = principal_id(access_code, jamb_reg_no)
@@ -72,6 +70,8 @@
     grok.implements(IApplicantPrincipal)
 
-    def __init__(self, reg_no, access_code):
-        self.id = '%s-%s' % (reg_no, access_code)
+    def __init__(self, access_code, reg_no, prefix=None):
+        self.id = principal_id(access_code, reg_no)
+        if prefix is not None:
+            self.id = '%s.%s' % (prefix, self.id)
         self.title = u'Applicant'
         self.description = u'An applicant'
@@ -100,6 +100,7 @@
     def __call__(self, authentication):
         principal = ApplicantPrincipal(
-            authentication.prefix + self.info.reg_no,
-            self.info.access_code
+            self.info.access_code,
+            self.info.reg_no,
+            authentication.prefix,
             )
         notify(
