Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py	(revision 11613)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py	(revision 11614)
@@ -55,9 +55,13 @@
     grok.provides(IApplicant)
 
-    create_names = [
-        'firstname', 'middlename', 'lastname',
-        'sex', 'date_of_birth',
-        'email', 'phone'
-        ]
+    applicant_student_mapping = (
+        ('firstname', 'firstname'),
+        ('middlename', 'middlename'),
+        ('lastname', 'lastname'),
+        ('sex', 'sex'),
+        ('date_of_birth', 'date_of_birth'),
+        ('email', 'email'),
+        ('phone', 'phone'),
+        )
 
     def __init__(self):
@@ -134,6 +138,6 @@
         # Set student attributes
         try:
-            for name in self.create_names:
-                setattr(student, name, getattr(self, name, None))
+            for item in self.applicant_student_mapping:
+                setattr(student, item[1], getattr(self, item[0], None))
         except RequiredMissing, err:
             return False, 'RequiredMissing: %s' % err
