Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt	(revision 7600)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt	(revision 7601)
@@ -553,5 +553,5 @@
   >>> ctrl = browser.getControl(name='form.semester')
   >>> ctrl.options
-  ['0', '1', '2', '3']
+  ['9', '1', '2', '3']
 
   >>> ctrl.displayOptions
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/vocabularies.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/vocabularies.py	(revision 7600)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/vocabularies.py	(revision 7601)
@@ -41,5 +41,5 @@
         end_level = int(studycourse.certificate.end_level)
     else:
-        start_level = 0
+        start_level = 10
         end_level = 600
     levels = [level for level in range(start_level,end_level+200,10)
Index: /main/waeup.sirp/trunk/src/waeup/sirp/university/interfaces.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/university/interfaces.py	(revision 7600)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/university/interfaces.py	(revision 7601)
@@ -163,5 +163,5 @@
     semester = schema.Choice(
         title = u'Semester/Term',
-        default = 0,
+        default = 9,
         vocabulary = semester,
         required = True,
Index: /main/waeup.sirp/trunk/src/waeup/sirp/university/vocabularies.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/university/vocabularies.py	(revision 7600)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/university/vocabularies.py	(revision 7601)
@@ -35,5 +35,5 @@
 
 course_levels = SimpleSIRPVocabulary(
-    ('Pre-Studies',0),
+    ('Pre-Studies', 10),
     ('100 (Year 1)',100),
     ('200 (Year 2)',200),
@@ -47,5 +47,5 @@
 
 semester = SimpleSIRPVocabulary(
-    ('N/A', 0),
+    ('N/A', 9),
     ('First Semester', 1),
     ('Second Semester', 2),
@@ -58,4 +58,5 @@
     ('Sandwich','sandwich'),
     ('Postgraduate','pg'),
+    ('no application','no'),
     )
 
