Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py	(revision 9520)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py	(revision 9521)
@@ -1400,6 +1400,6 @@
 
     def update(self):
-        if self.context.student.is_fresh:
-            self.flash(_("You can't pay for a session below your entry session."))
+        if self.context.student.before_payment:
+            self.flash(_("No previous payment to be made."))
             self.redirect(self.url(self.context))
         super(PreviousPaymentAddFormPage, self).update()
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/student.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/student.py	(revision 9520)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/student.py	(revision 9521)
@@ -37,5 +37,5 @@
     IObjectHistory, IUserAccount, IFileStoreNameChooser, IFileStoreHandler,
     IKofaUtils, registration_states_vocab, IExtFileStore,
-    CLEARANCE)
+    CLEARANCE, PAID, REGISTERED, VALIDATED, RETURNING)
 from waeup.kofa.students.accommodation import StudentAccommodation
 from waeup.kofa.students.export import EXPORTER_NAMES
@@ -193,8 +193,10 @@
 
     @property
-    def is_fresh(self):
+    def before_payment(self):
         entry_session = getattr(
             self.get('studycourse', None), 'entry_session', None)
-        if self.current_session == entry_session:
+        non_fresh_states = (PAID, REGISTERED, VALIDATED, RETURNING, )
+        if self.current_session == entry_session and \
+            self.state not in non_fresh_states:
             return True
         return False
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 9520)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 9521)
@@ -2199,6 +2199,8 @@
         self.assertFalse(self.student['payments'][value].p_current)
 
-        # Button and form are not available for fresh students
+        # Button and form are not available for students who are in
+        # states up to cleared
         self.student['studycourse'].entry_session = 2004
+        IWorkflowState(self.student).setState('cleared')
         self.browser.open(self.payments_path)
         self.assertFalse(
@@ -2206,6 +2208,5 @@
         self.browser.open(self.payments_path + '/addpp')
         self.assertTrue(
-            "You can't pay for a session below your entry session" in
-            self.browser.contents)
+            "No previous payment to be made" in self.browser.contents)
         return
 
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py	(revision 9520)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py	(revision 9521)
@@ -335,4 +335,5 @@
         if academic_session == None:
             return _(u'Session configuration object is not available.'), None
+        # Determine fee.
         if category == 'schoolfee':
             try:
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py	(revision 9520)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py	(revision 9521)
@@ -611,5 +611,5 @@
     def target_url(self):
         student = self.view.context.student
-        if student.is_fresh:
+        if student.before_payment:
             return ''
         return self.view.url(self.view.context, self.target)
