--- a/app/soc/views/models/student.py	Sun Feb 22 11:18:53 2009 +0000
+++ b/app/soc/views/models/student.py	Sun Feb 22 11:19:29 2009 +0000
@@ -89,15 +89,26 @@
 
     new_params['extra_dynaexclude'] = ['agreed_to_tos', 'school']
 
-    new_params['create_extra_dynaproperties'] = {
-        'scope_path': forms.fields.CharField(widget=forms.HiddenInput,
-                                             required=True),
-        'student_agreement': forms.fields.CharField(required=False,
-            widget=widgets.AgreementField),
-        'agreed_to_student_agreement': forms.fields.BooleanField(
-            initial=False, required=True,
-            label=ugettext('I agree to the Student Agreement')),
-        }
+    new_params['create_dynafields'] = [
+        {'name': 'scope_path',
+         'base': forms.fields.CharField,
+         'widget': forms.HiddenInput,
+         'required': True,
+         },
+        {'name': 'student_agreement',
+         'base': forms.fields.CharField,
+         'required': False,
+         'widget': widgets.AgreementField,
+         'group': ugettext("5. Terms of Service"),
+         },
+        {'name': 'agreed_to_student_agreement',
+         'base': forms.fields.BooleanField,
+         'initial': False,
+         'required':True,
+         'label': ugettext('I agree to the Student Agreement'),
+         'group': ugettext("5. Terms of Service"),
+         },
+        ]
 
     new_params['show_in_roles_overview'] = True