Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/browser.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/browser.py	(revision 15875)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/browser.py	(revision 15876)
@@ -977,8 +977,6 @@
     def _searchCatalog(self, session):
         cat = queryUtility(ICatalog, name='coursetickets_catalog')
-        # Temporarily we allow students to pay for next session, so their
-        # current_session might have increased
         coursetickets = cat.searchResults(
-            session=(session, session+1),
+            session=(session, session),
             code=(self.context.code, self.context.code)
             )
Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py	(revision 15875)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py	(revision 15876)
@@ -452,5 +452,6 @@
             # Temporarily we allow students to pay for next session, so their
             # current_session might have increased
-            if self.student.state in (VALIDATED, REGISTERED, PAID) and \
+            if self.student.state in (
+                VALIDATED, REGISTERED, PAID, RETURNING) and \
                 self.student.current_session in (cas, cas+1):
                 return True
