Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py	(revision 8641)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py	(revision 8642)
@@ -1743,4 +1743,5 @@
         'level_session', 'level_verdict')
     pnav = 4
+    max_credits = 50
 
     def update(self):
@@ -1798,4 +1799,8 @@
     @action(_('Register course list'), style='primary')
     def registerCourses(self, **data):
+        if self.total_credits > self.max_credits:
+            self.flash(_('Maximum credits of ${a} exceeded.',
+                mapping = {'a':self.max_credits}))
+            return
         IWorkflowInfo(self.context.getStudent()).fireTransition(
             'register_courses')
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 8641)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 8642)
@@ -1255,9 +1255,14 @@
         self.student['studycourse']['200']['COURSE1'].mandatory = False
         self.browser.open(self.student_path + '/studycourse/200/edit')
-        # Now the student can remove the ticket
+        # Course list can't be registered if total_credits exceeds max_credits
+        self.student['studycourse']['200']['COURSE1'].credits = 60
+        self.browser.getControl("Register course list").click()
+        self.assertTrue('Maximum credits of 50 exceeded' in self.browser.contents)
+        # Student can now remove the ticket
         ctrl = self.browser.getControl(name='val_id')
         ctrl.getControl(value='COURSE1').selected = True
         self.browser.getControl("Remove selected", index=0).click()
         self.assertTrue('Successfully removed' in self.browser.contents)
+        # Course list can be registered, even if it's empty
         self.browser.getControl("Register course list").click()
         self.assertTrue('Course list has been registered' in self.browser.contents)
