diff --git a/generic/templates/generic/partials/cid_user_li.html b/generic/templates/generic/partials/cid_user_li.html
index 36e06fe3..48e201d5 100644
--- a/generic/templates/generic/partials/cid_user_li.html
+++ b/generic/templates/generic/partials/cid_user_li.html
@@ -8,7 +8,7 @@
     </div>
     <div class="btn-group ms-2">
         <a href="{% url 'generic:update_cid' cid.pk %}" class="btn btn-sm btn-outline-light">Edit</a>
-          <form method="post" class="d-inline m-0 p-0"
+        <form method="post" class="d-inline m-0 p-0"
               action="{% url exam.app_name|add:':exam_json_edit' exam.pk %}"
               hx-post="{% url exam.app_name|add:':exam_json_edit' exam.pk %}"
               hx-target="closest li"
diff --git a/generic/views.py b/generic/views.py
index 910ec6e1..3907249f 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -2379,20 +2379,17 @@ class ExamViews(View, LoginRequiredMixin):
                 else:
                     app_exam_map[self.app_name].remove(pk)
 
-                # If this is an HTMX request, return the rendered li partial
-                if request.headers.get('HX-Request') == 'true':
-                    # Render the updated list item and return as HTML so HTMX can swap it
-                    html = render_to_string(
-                        'generic/partials/cid_user_li.html',
-                        {'cid': cid_user, 'exam': exam, 'current': add},
-                        request=request,
-                    )
-                    response = HttpResponse(html, content_type='text/html')
-                    response['HX-Trigger'] = json.dumps({'cid_toggled': {'pk': cid_user.pk, 'added': add}})
-                    return response
-
-                data = {"status": "success", "added": add}
-                return JsonResponse(data, status=200)
+                # Always return the rendered list-item HTML so HTMX (or our fetch fallback)
+                # can swap the updated `<li>` into the DOM. Also provide an `HX-Trigger`
+                # header so client-side toasts/handlers can respond.
+                html = render_to_string(
+                    'generic/partials/cid_user_li.html',
+                    {'cid': cid_user, 'exam': exam, 'current': add},
+                    request=request,
+                )
+                response = HttpResponse(html, content_type='text/html')
+                response['HX-Trigger'] = json.dumps({'cid_toggled': {'pk': cid_user.pk, 'added': add}})
+                return response
 
             if "edit_user_user" in request.POST:
                 user_id = request.POST.get("edit_user_user")