.

generic/forms.py

@@ -155,6 +155,7 @@ class CidUserForm(ModelForm):
             "supervisor_email",
             "login_email_sent",
             "results_email_sent",
+            "group",
         ]
 
 class CidUserGroupForm(ModelForm):

generic/templates/generic/cidusergroup_form.html

@@ -22,5 +22,8 @@ Use this form to create / edit a CID user group.
         {{ form.as_table }}
     </table>
     <input type="submit" class="submit-button" value="Submit" name="submit">
+
+    <h3>Users</h3>
+
 </form>
 {% endblock %}

generic/templates/generic/group_view.html

@@ -31,6 +31,6 @@
     {% if view_all %}
         <a href="{% url 'generic:group_view' %}">View active</a>
     {% else %}
-    <a href="{% url 'generic:group_view_all' %}">View all</a>
+        <a href="{% url 'generic:group_view_all' %}">View all</a>
     {% endif %}
 {% endblock %}