Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/student.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/student.py	(revision 16668)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/student.py	(revision 16669)
@@ -43,4 +43,8 @@
         return True
 
+    @property
+    def studycourse_locked(self):
+        return super(CustomStudent, self).studycourse_locked
+
 # Set all attributes of Student required in IStudent as field
 # properties. Doing this, we do not have to set initial attributes
Index: /main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py	(revision 16668)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py	(revision 16669)
@@ -67,5 +67,5 @@
         'ent_registration_1': 'Registration Fee ENT201',
         'fac_dep': 'Faculty and Departmental Dues (incl. ICT/Affidavit Dues)',
-        'ict': 'ICT Fee',
+        'ict': 'ICT/Affidavit Dues',
         'affidavit': 'Affidavit Dues',
         'restitution': 'Restitution Fee',
@@ -107,6 +107,6 @@
         'ent_registration_1': 'Registration Fee ENT201',
         #'fac_dep': 'Faculty and Departmental Dues (incl. ICT/Affidavit Dues)',
-        'ict': 'ICT Fee',
-        'affidavit': 'Affidavit Dues',
+        'ict': 'ICT/Affidavit Dues',
+        #'affidavit': 'Affidavit Dues',
         'restitution': 'Restitution Fee',
         'sports': 'Sports Fee',
@@ -205,6 +205,6 @@
         'ent_registration_1': 'Registration Fee ENT201',
         #'fac_dep': 'Faculty and Departmental Dues (incl. ICT/Affidavit Dues)',
-        'ict': 'ICT Fee',
-        'affidavit': 'Affidavit Dues',
+        'ict': 'ICT/Affidavit Dues',
+        #'affidavit': 'Affidavit Dues',
         'restitution': 'Restitution Fee',
         }
