Index: main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/tests/test_utils.py
===================================================================
--- main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/tests/test_utils.py	(revision 9600)
+++ main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/tests/test_utils.py	(revision 9614)
@@ -14,14 +14,30 @@
         acc_details  = students_utils.getAccommodationDetails(self.student)
         self.assertEqual(acc_details['bt'], 'regular_male_fr')
+
         self.student['studycourse'].current_level = 200
         acc_details  = students_utils.getAccommodationDetails(self.student)
         self.assertEqual(acc_details['bt'], 'regular_male_re')
+
+        self.student['studycourse'].current_level = 210
+        acc_details  = students_utils.getAccommodationDetails(self.student)
+        self.assertEqual(acc_details['bt'], 'regular_male_re')
+
         self.student['studycourse'].current_level = 300
         acc_details  = students_utils.getAccommodationDetails(self.student)
         self.assertEqual(acc_details['bt'], 'regular_male_fi')
+
         self.student['studycourse'].current_level = 400
         acc_details  = students_utils.getAccommodationDetails(self.student)
-        self.assertEqual(acc_details['bt'], 'regular_male_fi')
+        self.assertEqual(acc_details['bt'], 'regular_male_fr')
+
         self.student['studycourse'].current_level = 500
+        acc_details  = students_utils.getAccommodationDetails(self.student)
+        self.assertEqual(acc_details['bt'], 'regular_male_re')
+
+        self.student['studycourse'].current_level = 510
+        acc_details  = students_utils.getAccommodationDetails(self.student)
+        self.assertEqual(acc_details['bt'], 'regular_male_re')
+
+        self.student['studycourse'].current_level = 600
         acc_details  = students_utils.getAccommodationDetails(self.student)
         self.assertEqual(acc_details['bt'], 'regular_male_fi')
Index: main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/utils.py
===================================================================
--- main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/utils.py	(revision 9600)
+++ main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/utils.py	(revision 9614)
@@ -204,7 +204,7 @@
         if current_level == 10:
             bt = 'pr'
-        elif current_level == 100:
+        elif current_level in (100, 400):
             bt = 'fr'
-        elif current_level >= 300:
+        elif current_level in (300, 600):
             bt = 'fi'
         else:
