diff --git a/generic/filters.py b/generic/filters.py
index a9f10c94..d8f044c9 100644
--- a/generic/filters.py
+++ b/generic/filters.py
@@ -45,8 +45,8 @@ class UserUserFilter(django_filters.FilterSet):
             "first_name": ["contains"],
             "last_name": ["contains"],
             #"active": ["exact"],
-            #"group": ["exact"],
-            #"group__name": ["contains"],
+            "user_groups": ["exact"],
+            "user_groups__name": ["contains"],
             #"userprofile__grade": ["exact"],
             #"userprofile__supervisor": ["exact"],
             "email": ["contains"],
diff --git a/generic/tests/test_cid_urls.py b/generic/tests/test_cid_urls.py
new file mode 100644
index 00000000..e69de29b
diff --git a/templates/index.html b/templates/index.html
index 7748bd55..426c0bce 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -30,7 +30,7 @@
     <p><a href="{% url 'cid_selector' %}">CID users can log in here</a></p>
     <div>
         {% if request.user.is_staff %}
-            Manage users <a href="{% url 'generic:manage_cids'%}">here</a>
+            Manage users <a href="{% url 'accounts_list'%}">here</a> and candidates <a href="{% url 'generic:manage_cids'%}">here</a>
         {% endif %}
     </div>
 {% endblock %}