Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py	(revision 17891)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py	(revision 17892)
@@ -535,5 +535,5 @@
         return text
 
-    def warnCreditsOOR(self, studylevel, course=None):
+    def deactivated_warnCreditsOOR(self, studylevel, course=None):
         studycourse = studylevel.__parent__
         certificate = getattr(studycourse,'certificate', None)
@@ -549,4 +549,11 @@
             return  _('Maximum credits exceeded.')
         elif studylevel.total_credits > limit:
+            return _('Maximum credits exceeded.')
+        return
+
+    def warnCreditsOOR(self, studylevel, course=None):
+        if course and studylevel.total_credits + course.credits > 48:
+            return _('Maximum credits exceeded.')
+        elif studylevel.total_credits > 48:
             return _('Maximum credits exceeded.')
         return
