Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py	(revision 15306)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py	(revision 15307)
@@ -736,5 +736,5 @@
     def test_edit_level_by_co(self):
         # Create clearance officer
-        self.app['users'].addUser('mrclear', 'mrclearsecret')
+        self.app['users'].addUser('mrclear', 'mrClearsecret1')
         self.app['users']['mrclear'].email = 'mrclear@foo.ng'
         self.app['users']['mrclear'].title = 'Carlo Pitter'
@@ -749,5 +749,5 @@
         self.browser.open(self.login_path)
         self.browser.getControl(name="form.login").value = 'mrclear'
-        self.browser.getControl(name="form.password").value = 'mrclearsecret'
+        self.browser.getControl(name="form.password").value = 'mrClearsecret1'
         self.browser.getControl("Login").click()
         self.assertMatches('...You logged in...', self.browser.contents)
@@ -890,5 +890,5 @@
     def test_handle_clearance_by_co(self):
         # Create clearance officer
-        self.app['users'].addUser('mrclear', 'mrclearsecret')
+        self.app['users'].addUser('mrclear', 'mrClearsecret1')
         self.app['users']['mrclear'].email = 'mrclear@foo.ng'
         self.app['users']['mrclear'].title = 'Carlo Pitter'
@@ -902,5 +902,5 @@
         self.browser.open(self.login_path)
         self.browser.getControl(name="form.login").value = 'mrclear'
-        self.browser.getControl(name="form.password").value = 'mrclearsecret'
+        self.browser.getControl(name="form.password").value = 'mrClearsecret1'
         self.browser.getControl("Login").click()
         self.assertMatches('...You logged in...', self.browser.contents)
Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py	(revision 15306)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py	(revision 15307)
@@ -81,6 +81,8 @@
                 'A', 'B', 'F', 'J', 'M', 'C', 'Z'):
             return _("Your are not eligible to book accommodation.")
-        if str(acc_details[
-            'booking_session']) in student['accommodation'].keys():
+        bsession = str(acc_details['booking_session'])
+        if bsession in student['accommodation'].keys() \
+            and not 'booking expired' in \
+            student['accommodation'][bsession].bed_coordinates:
             return _('You already booked a bed space in '
                      'current accommodation session.')
