diff --git a/generic/templates/generic/group_view.html b/generic/templates/generic/group_view.html
index cd4f0042..76876c2a 100755
--- a/generic/templates/generic/group_view.html
+++ b/generic/templates/generic/group_view.html
@@ -27,4 +27,10 @@
         })
 
     </script>
+
+    {% if view_all %}
+        <a href="{% url 'generic:group_create' %}">View active</a>
+    {% else %}
+    <a href="{% url 'generic:group_create_all' %}">View all</a>
+    {% endif %}
 {% endblock %}
diff --git a/generic/urls.py b/generic/urls.py
index 2040b022..9fb0875c 100755
--- a/generic/urls.py
+++ b/generic/urls.py
@@ -37,6 +37,7 @@ urlpatterns = [
     path("cids/manage/", views.CidUserView.as_view(), name="manage_cids"),
     path("cids/manage/exams", views.CidUserExamView.as_view(), name="manage_cid_exams"),
     path("cids/group/", views.group_view, name="group_view"),
+    path("cids/group/all", views.group_view_all, name="group_view_all"),
     path("cids/group/<int:pk>/email", views.group_email, name="group_email"),
     path(
         "cids/group/<int:pk>/email_results",
diff --git a/generic/views.py b/generic/views.py
index 3f98b29d..cd30ea5e 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -1383,6 +1383,26 @@ def group_view(request):
         {"groups": groups},
     )
 
+@user_is_cid_user_manager
+def group_view(request):
+    groups = CidUserGroup.objects.filter(archive=False)
+
+    return render(
+        request,
+        "generic/group_view.html",
+        {"groups": groups, "view_all": False},
+    )
+
+@user_is_cid_user_manager
+def group_view_all(request):
+    groups = CidUserGroup.objects.filter()
+
+    return render(
+        request,
+        "generic/group_view.html",
+        {"groups": groups, "view_all": True},
+    )
+
 
 @login_required
 @user_is_cid_user_manager