Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py	(revision 9114)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py	(revision 9115)
@@ -18,4 +18,5 @@
 """Interfaces of the university application package.
 """
+from datetime import datetime
 from grokcore.content.interfaces import IContainer
 from zc.sourcefactory.contextual import BasicContextualSourceFactory
@@ -28,5 +29,5 @@
 from waeup.kofa.schema import TextLineChoice, FormattedDate
 from waeup.kofa.interfaces import (
-    IKofaObject, year_range, validate_email,
+    IKofaObject, validate_email,
     SimpleKofaVocabulary)
 from waeup.kofa.interfaces import MessageFactory as _
@@ -40,4 +41,8 @@
 
 _marker = object() # a marker different from None
+
+def year_range():
+    curr_year = datetime.now().year
+    return range(curr_year - 2, curr_year + 5)
 
 class RegNumInSource(ValidationError):
Index: /main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py	(revision 9114)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py	(revision 9115)
@@ -65,11 +65,7 @@
             SimpleTerm(value, value, title) for title, value in terms])
 
-def year_range():
-    curr_year = datetime.now().year
-    return range(1995, curr_year + 5)
-
 def academic_sessions():
     curr_year = datetime.now().year
-    year_range = range(curr_year - 15, curr_year + 2)
+    year_range = range(1995, curr_year + 2)
     return [('%s/%s' % (year,year+1), year) for year in year_range]
 
