Index: /main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/utils.py
===================================================================
--- /main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/utils.py	(revision 16376)
+++ /main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/utils.py	(revision 16377)
@@ -69,7 +69,11 @@
         package only maximum credits is set.
         """
-        if course and studylevel.total_credits + course.credits > 60:
+        max_credits = 60
+        end_level = getattr(studylevel.__parent__.certificate, 'end_level', None)
+        if end_level and studylevel.level >= end_level:
+            max_credits = 80
+        if course and studylevel.total_credits + course.credits > max_credits:
             return _('Maximum credits exceeded.')
-        elif studylevel.total_credits > 60:
+        elif studylevel.total_credits > max_credits:
             return _('Maximum credits exceeded.')
         return
