Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/viewlets.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/viewlets.py	(revision 15842)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/viewlets.py	(revision 15843)
@@ -296,5 +296,5 @@
     @property
     def target_url(self):
-        if self.context.p_state == 'paid':
+        if self.context.p_state in ('paid', 'waived', 'scholarship'):
             return ''
         return self.view.url(self.view.context, self.target)
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py	(revision 15842)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py	(revision 15843)
@@ -540,5 +540,5 @@
     @property
     def target_url(self):
-        if self.context.p_state == 'paid':
+        if self.context.p_state in ('paid', 'waived', 'scholarship'):
             return ''
         return self.view.url(self.view.context, self.target)
