Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py	(revision 17974)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py	(revision 17975)
@@ -493,8 +493,5 @@
             else:
                 amount = 60000.0
-
-        elif student.state == CLEARED \
-                and student.is_jupeb and category in ('schoolfee', 'schoolfee_1',
-                                                      'secondinstall'):
+        elif student.is_jupeb:
             try:
                 certificate = student['studycourse'].certificate
@@ -502,8 +499,10 @@
             except (AttributeError, TypeError):
                 return _('Study course data are incomplete.'), None
-            amount = 220000.0
-            if category in ('schoolfee_1', 'secondinstall'):
-                amount /= 2
-
+            if student.state == CLEARED and category == 'schoolfee':
+                amount = 220000.0
+            if student.state == CLEARED and category == 'schoolfee_1':
+                amount = 110000.0
+            elif category == 'secondinstall':
+                amount = 110000.0
         elif category == 'schoolfee':
             try:
