diff --git a/app/templates/components/table.html b/app/templates/components/table.html
index 2925ee2f2..2697cc6f6 100644
--- a/app/templates/components/table.html
+++ b/app/templates/components/table.html
@@ -73,9 +73,9 @@
   </th>
 {%- endmacro %}
 
-{% macro index_field(text) -%}
+{% macro index_field(text=None) -%}
   <td class="table-field-index">
-    <span>{{ text }}</span>
+    {{ text if text != None else caller()  }}
   </td>
 {%- endmacro %}
 
diff --git a/app/templates/views/check.html b/app/templates/views/check.html
index 933bda753..5fd5590c0 100644
--- a/app/templates/views/check.html
+++ b/app/templates/views/check.html
@@ -191,11 +191,15 @@
         '<span class="visually-hidden">Row in file</span><span aria-hidden="true">1</span>'|safe
       ] + recipients.column_headers
     ) %}
-      {{ index_field(item.index + 2) }}
+      {% call index_field() %}
+        <span class="{% if item.index in recipients.rows_with_errors %}table-field-error{% endif %}">
+          {{ item.index + 2 }}
+        </span>
+      {% endcall %}
       {% for column in recipients.column_headers %}
         {% if item['columns'][column].error and not recipients.missing_column_headers %}
           {% call field() %}
-            <span class="table-field-error">
+            <span>
               <span class="table-field-error-label">{{ item['columns'][column].error }}</span>
               {{ item['columns'][column].data if item['columns'][column].data != None }}
             </span>
diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py
index a90d690f1..83a25adc7 100644
--- a/tests/app/main/views/test_send.py
+++ b/tests/app/main/views/test_send.py
@@ -255,7 +255,7 @@ def test_upload_valid_csv_shows_file_contents(
     assert response.status_code == 200
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
     for index, cell in enumerate([
-        '<td class="table-field-index"> <span>2</span> </td>',
+        '<td class="table-field-index"> <span class=""> 2 </span> </td>',
         '<td class="table-field-center-aligned "> <div class=""> 07700900986 </div> </td>',
         '<td class="table-field-center-aligned "> <div class=""> Jo </div> </td>',
         (