Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py	(revision 7060)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py	(revision 7061)
@@ -1236,6 +1236,10 @@
             self.redirect(self.url(self.context))
             return
-        if str(grok.getSite()[
-                'configuration'].accommodation_session) in self.context.keys():
+        if student['studycourse'].current_session != acc_details['booking_session']:
+            self.flash(
+                'Your current session does not match accommodation session.')
+            self.redirect(self.url(self.context))
+            return
+        if str(acc_details['booking_session']) in self.context.keys():
             self.flash('You already booked a bed space in current accommodation session.')
             self.redirect(self.url(self.context))
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py	(revision 7060)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py	(revision 7061)
@@ -132,4 +132,12 @@
         parts = self.existing_clrpin.split('-')[1:]
         self.existing_clrseries, self.existing_clrnumber = parts
+        # Create 2 access codes with prefix 'HOS'
+        pin_container.createBatch(
+            datetime.now(), 'some_userid', 'HOS', 9.99, 2)
+        pins = pin_container['HOS-1'].values()
+        self.existing_hosac = pins[0]
+        self.existing_hospin = pins[0].representation
+        parts = self.existing_hospin.split('-')[1:]
+        self.existing_hosseries, self.existing_hosnumber = parts
 
         # Populate university
@@ -920,4 +928,12 @@
                            self.browser.contents)
         IWorkflowInfo(self.student).fireTransition('admit')
+        # An existing HOS code can only be used if students
+        # are in accommodation session
+        self.student['studycourse'].current_session = 2003
+        self.browser.getLink("Book accommodation").click()
+        self.assertMatches('...Your current session does not match...',
+                           self.browser.contents)
+        self.student['studycourse'].current_session = 2004
+        # All requirements are met and ticket can be created
         self.browser.getLink("Book accommodation").click()
         self.assertMatches('...Activation Code:...',
