diff --git a/atlas/templates/atlas/collection_headers.html b/atlas/templates/atlas/collection_headers.html
index 26349bba..119c234d 100644
--- a/atlas/templates/atlas/collection_headers.html
+++ b/atlas/templates/atlas/collection_headers.html
@@ -1,6 +1,6 @@
 
 {% if request.user.is_authenticated %}
-    Collection: {{collection.name}}-> <a href="{% url 'atlas:collection_detail' pk=collection.pk %}">Overview</a> /
+    <br/>Collection: {{collection.name}}-> <a href="{% url 'atlas:collection_detail' pk=collection.pk %}">Overview</a> /
     <a href="{% url 'atlas:collection_mark_overview' collection.pk %}">Mark</a> /
     <a href="{% url 'atlas:collection_scores_cid' collection.pk %}">Scores</a> /
     <a href="{% url 'atlas:exam_cids' collection.pk %}">Candidates</a>
diff --git a/generic/templates/generic/exam_cids_edit.html b/generic/templates/generic/exam_cids_edit.html
index f08e4a63..d7b90a49 100644
--- a/generic/templates/generic/exam_cids_edit.html
+++ b/generic/templates/generic/exam_cids_edit.html
@@ -1,6 +1,7 @@
 
         
         <h3>CID Users</h3>
+        {% if groups %}
         Users from the following groups are available: {% for group in groups %}{{group}}{% endfor %} .
         <ol>
         {% for cid in current_cid_users %}
@@ -18,6 +19,9 @@
             
         {% endfor %}
         </ol>
+        {% else %}
+        This exam is not associated with any user groups. Edit and add a group to enable user management.
+        {% endif %}
             
         <a href="{% url 'generic:manage_cids' %}">Manage CIDs here</a>