diff --git a/generic/templates/generic/exam_cids_edit.html b/generic/templates/generic/exam_cids_edit.html
index d2600827..00b8c326 100644
--- a/generic/templates/generic/exam_cids_edit.html
+++ b/generic/templates/generic/exam_cids_edit.html
@@ -23,12 +23,22 @@
 </ol>
 
 {% comment %} Hide the toggle button if there are no users (to add or remove) {% endcomment %}
-{% if current_cid_users or available_cid_users %}
-    <p><button class="toggle-all-btn">Toggle all</button></p>
+<p>{% if current_cid_users or available_cid_users %}
+    <button class="toggle-all-btn">Toggle all</button>
 {% endif %}
+    <button class="add-all-btn">Add all</button>
+    <button class="remove-all-btn">Remove all</button>
+
+</p>
 
 <script>
     $(document).ready(() => {
+        $(".remove-all-btn").click((el) => {
+            $(".current .toggle-btn").click();
+        });
+        $(".add-all-btn").click((el) => {
+            $(":not(.current) .toggle-btn").click();
+        });
         $(".toggle-all-btn").click((el) => {
             $(".toggle-btn").click();
         });
diff --git a/generic/templates/generic/exam_users_edit.html b/generic/templates/generic/exam_users_edit.html
index bb932d8d..d5b0b264 100644
--- a/generic/templates/generic/exam_users_edit.html
+++ b/generic/templates/generic/exam_users_edit.html
@@ -37,12 +37,23 @@
 </ol>
 
 {% comment %} Hide the toggle button if there are no users (to add or remove) {% endcomment %}
+<p>
 {% if current_user_users or available_user_users %}
-    <p><button class="toggle-all-btn">Toggle all</button></p>
+    <button class="toggle-all-btn">Toggle all</button>
 {% endif %}
+    <button class="add-all-btn">Add all</button>
+    <button class="remove-all-btn">Remove all</button>
+
+</p>
 
 <script>
     $(document).ready(() => {
+        $(".remove-all-btn").click((el) => {
+            $(".current .toggle-btn").click();
+        });
+        $(".add-all-btn").click((el) => {
+            $("li:not(.current) .toggle-btn").click();
+        });
         $(".toggle-all-btn").click((el) => {
             $(".toggle-btn").click();
         });