diff --git a/wagtail/admin/templates/wagtailadmin/chooser/anchor_link.html b/wagtail/admin/templates/wagtailadmin/chooser/anchor_link.html
index c3be2c7f3046..8140cb198d5a 100644
--- a/wagtail/admin/templates/wagtailadmin/chooser/anchor_link.html
+++ b/wagtail/admin/templates/wagtailadmin/chooser/anchor_link.html
@@ -9,7 +9,9 @@
         {% csrf_token %}
         <ul class="fields">
             {% for field in form %}
-                {% include "wagtailadmin/shared/field_as_li.html" %}
+                <li>
+                    {% include "wagtailadmin/shared/field.html" %}
+                </li>
             {% endfor %}
             <li><input type="submit" value="{% trans 'Insert anchor' %}"  class="button" /></li>
         </ul>
diff --git a/wagtail/admin/templates/wagtailadmin/chooser/email_link.html b/wagtail/admin/templates/wagtailadmin/chooser/email_link.html
index 1938f3da9a7c..eaaedd7df136 100644
--- a/wagtail/admin/templates/wagtailadmin/chooser/email_link.html
+++ b/wagtail/admin/templates/wagtailadmin/chooser/email_link.html
@@ -9,7 +9,9 @@
         {% csrf_token %}
         <ul class="fields">
             {% for field in form %}
-                {% include "wagtailadmin/shared/field_as_li.html" %}
+                <li>
+                    {% include "wagtailadmin/shared/field.html" %}
+                </li>
             {% endfor %}
             <li><input type="submit" value="{% trans 'Insert link' %}"  class="button" /></li>
         </ul>
diff --git a/wagtail/admin/templates/wagtailadmin/chooser/external_link.html b/wagtail/admin/templates/wagtailadmin/chooser/external_link.html
index a00e0d39b18e..5c57f467e8a5 100644
--- a/wagtail/admin/templates/wagtailadmin/chooser/external_link.html
+++ b/wagtail/admin/templates/wagtailadmin/chooser/external_link.html
@@ -9,7 +9,9 @@
         {% csrf_token %}
         <ul class="fields">
             {% for field in form %}
-                {% include "wagtailadmin/shared/field_as_li.html" %}
+                <li>
+                    {% include "wagtailadmin/shared/field.html" %}
+                </li>
             {% endfor %}
             <li><input type="submit" value="{% trans 'Insert link' %}" class="button" /></li>
         </ul>
diff --git a/wagtail/admin/templates/wagtailadmin/chooser/phone_link.html b/wagtail/admin/templates/wagtailadmin/chooser/phone_link.html
index 1db1e3cdd81b..9c8b56ca5743 100644
--- a/wagtail/admin/templates/wagtailadmin/chooser/phone_link.html
+++ b/wagtail/admin/templates/wagtailadmin/chooser/phone_link.html
@@ -9,7 +9,9 @@
         {% csrf_token %}
         <ul class="fields">
             {% for field in form %}
-                {% include "wagtailadmin/shared/field_as_li.html" %}
+                <li>
+                    {% include "wagtailadmin/shared/field.html" %}
+                </li>
             {% endfor %}
             <li><input type="submit" value="{% trans 'Insert link' %}"  class="button" /></li>
         </ul>
diff --git a/wagtail/admin/templates/wagtailadmin/generic/chooser/chooser.html b/wagtail/admin/templates/wagtailadmin/generic/chooser/chooser.html
index 7b9b42dceb88..511c1085ee69 100644
--- a/wagtail/admin/templates/wagtailadmin/generic/chooser/chooser.html
+++ b/wagtail/admin/templates/wagtailadmin/generic/chooser/chooser.html
@@ -36,7 +36,9 @@
                         {% if filter_form.visible_fields %}
                             <ul class="fields">
                                 {% for field in filter_form.visible_fields %}
-                                    {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                                    <li>
+                                        {% include "wagtailadmin/shared/field.html" with field=field %}
+                                    </li>
                                 {% endfor %}
                             </ul>
                         {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/generic/chooser/creation_form.html b/wagtail/admin/templates/wagtailadmin/generic/chooser/creation_form.html
index 2ac4e25fc62b..61137f1b6c83 100644
--- a/wagtail/admin/templates/wagtailadmin/generic/chooser/creation_form.html
+++ b/wagtail/admin/templates/wagtailadmin/generic/chooser/creation_form.html
@@ -13,7 +13,9 @@
 
         <ul class="fields">
             {% for field in creation_form.visible_fields %}
-                {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                <li>
+                    {% include "wagtailadmin/shared/field.html" with field=field %}
+                </li>
             {% endfor %}
             <li>
                 {% if create_action_clicked_label %}
diff --git a/wagtail/admin/templates/wagtailadmin/generic/form.html b/wagtail/admin/templates/wagtailadmin/generic/form.html
index 229037105135..f998c4820604 100644
--- a/wagtail/admin/templates/wagtailadmin/generic/form.html
+++ b/wagtail/admin/templates/wagtailadmin/generic/form.html
@@ -19,7 +19,9 @@
         <ul class="fields">
             {% block visible_fields %}
                 {% for field in form.visible_fields %}
-                    {% include "wagtailadmin/shared/field_as_li.html" %}
+                    <li>
+                        {% include "wagtailadmin/shared/field.html" %}
+                    </li>
                 {% endfor %}
             {% endblock %}
 
diff --git a/wagtail/admin/templates/wagtailadmin/generic/multiple_upload/edit_form.html b/wagtail/admin/templates/wagtailadmin/generic/multiple_upload/edit_form.html
index 84f049dae3d8..b1e14d5a018f 100644
--- a/wagtail/admin/templates/wagtailadmin/generic/multiple_upload/edit_form.html
+++ b/wagtail/admin/templates/wagtailadmin/generic/multiple_upload/edit_form.html
@@ -9,7 +9,9 @@
             {% if field.is_hidden %}
                 {{ field }}
             {% else %}
-                {% include "wagtailadmin/shared/field_as_li.html" %}
+                <li>
+                    {% include "wagtailadmin/shared/field.html" %}
+                </li>
             {% endif %}
         {% endfor %}
         <li>
diff --git a/wagtail/admin/templates/wagtailadmin/pages/copy.html b/wagtail/admin/templates/wagtailadmin/pages/copy.html
index 953f889f1e4c..51e04687a708 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/copy.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/copy.html
@@ -11,20 +11,32 @@
             <input type="hidden" name="next" value="{{ next }}" />
 
             <ul class="fields">
-                {% include "wagtailadmin/shared/field_as_li.html" with field=form.new_title %}
-                {% include "wagtailadmin/shared/field_as_li.html" with field=form.new_slug %}
-                {% include "wagtailadmin/shared/field_as_li.html" with field=form.new_parent_page %}
+                <li>
+                    {% include "wagtailadmin/shared/field.html" with field=form.new_title %}
+                </li>
+                <li>
+                    {% include "wagtailadmin/shared/field.html" with field=form.new_slug %}
+                </li>
+                <li>
+                    {% include "wagtailadmin/shared/field.html" with field=form.new_parent_page %}
+                </li>
 
                 {% if form.copy_subpages %}
-                    {% include "wagtailadmin/shared/field_as_li.html" with field=form.copy_subpages %}
+                    <li>
+                        {% include "wagtailadmin/shared/field.html" with field=form.copy_subpages %}
+                    </li>
                 {% endif %}
 
                 {% if form.publish_copies %}
-                    {% include "wagtailadmin/shared/field_as_li.html" with field=form.publish_copies %}
+                    <li>
+                        {% include "wagtailadmin/shared/field.html" with field=form.publish_copies %}
+                    </li>
                 {% endif %}
 
                 {% if form.alias %}
-                    {% include "wagtailadmin/shared/field_as_li.html" with field=form.alias %}
+                    <li>
+                        {% include "wagtailadmin/shared/field.html" with field=form.alias %}
+                    </li>
                 {% endif %}
             </ul>
 
diff --git a/wagtail/admin/templates/wagtailadmin/pages/move_choose_destination.html b/wagtail/admin/templates/wagtailadmin/pages/move_choose_destination.html
index 0cc262bb3e2a..134dc8ac7501 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/move_choose_destination.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/move_choose_destination.html
@@ -10,7 +10,9 @@
             {% csrf_token %}
 
             <ul class="fields">
-                {% include "wagtailadmin/shared/field_as_li.html" with field=move_form.new_parent_page %}
+                <li>
+                    {% include "wagtailadmin/shared/field.html" with field=move_form.new_parent_page %}
+                </li>
             </ul>
 
             <input type="submit" value="{% trans 'Confirm' %}" class="button">
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/create_task.html b/wagtail/admin/templates/wagtailadmin/workflows/create_task.html
index f5516daacbc3..e450380b0a62 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/create_task.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/create_task.html
@@ -18,7 +18,9 @@
         <ul class="fields nice-padding">
             {% for field in form %}
                 {% if not field.is_hidden %}
-                    {% include "wagtailadmin/shared/field_as_li.html" %}
+                    <li>
+                        {% include "wagtailadmin/shared/field.html" %}
+                    </li>
                 {% else %}
                     {{ field }}
                 {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/edit_task.html b/wagtail/admin/templates/wagtailadmin/workflows/edit_task.html
index 472525b281ca..7b5624d35e19 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/edit_task.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/edit_task.html
@@ -17,7 +17,9 @@
         <ul class="fields nice-padding">
             {% for field in form %}
                 {% if not field.is_hidden %}
-                    {% include "wagtailadmin/shared/field_as_li.html" %}
+                    <li>
+                        {% include "wagtailadmin/shared/field.html" %}
+                    </li>
                 {% else %}
                     {{ field }}
                 {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/chooser.html b/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/chooser.html
index eeecc0925501..0b987262f13c 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/chooser.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/chooser.html
@@ -33,7 +33,9 @@
                 <form class="task-search" action="{% url 'wagtailadmin_workflows:task_chooser_results' %}" method="GET" novalidate>
                     <ul class="fields">
                         {% for field in search_form %}
-                            {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                            <li>
+                                {% include "wagtailadmin/shared/field.html" with field=field %}
+                            </li>
                         {% endfor %}
                     </ul>
                 </form>
@@ -48,7 +50,9 @@
         <form class="task-search" action="{% url 'wagtailadmin_workflows:task_chooser_results' %}" method="GET" novalidate>
             <ul class="fields">
                 {% for field in search_form %}
-                    {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                    <li>
+                        {% include "wagtailadmin/shared/field.html" with field=field %}
+                    </li>
                 {% endfor %}
             </ul>
         </form>
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/create_form.html b/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/create_form.html
index 3dedd957df93..5d5e99efcbdc 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/create_form.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/create_form.html
@@ -15,7 +15,9 @@
             {% if field.is_hidden %}
                 {{ field }}
             {% else %}
-                {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                <li>
+                    {% include "wagtailadmin/shared/field.html" with field=field %}
+                </li>
             {% endif %}
         {% endfor %}
         <li>
diff --git a/wagtail/contrib/forms/templates/wagtailforms/submissions_index.html b/wagtail/contrib/forms/templates/wagtailforms/submissions_index.html
index 666a5efaf68d..663e56f67c6f 100644
--- a/wagtail/contrib/forms/templates/wagtailforms/submissions_index.html
+++ b/wagtail/contrib/forms/templates/wagtailforms/submissions_index.html
@@ -110,7 +110,9 @@ <h2>{% trans 'Filter' %}</h2>
                     {% icon name="spinner" %}{% trans 'Apply filters' %}
                 </button>
                 {% for field in select_date_form %}
-                    {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                    <li>
+                        {% include "wagtailadmin/shared/field.html" with field=field %}
+                    </li>
                 {% endfor %}
             </form>
         </div>
diff --git a/wagtail/contrib/redirects/templates/wagtailredirects/add.html b/wagtail/contrib/redirects/templates/wagtailredirects/add.html
index e18175509c40..6d2e7f52c924 100644
--- a/wagtail/contrib/redirects/templates/wagtailredirects/add.html
+++ b/wagtail/contrib/redirects/templates/wagtailredirects/add.html
@@ -12,7 +12,9 @@
 
         <ul class="fields">
             {% for field in form.visible_fields %}
-                {% include "wagtailadmin/shared/field_as_li.html" %}
+                <li>
+                    {% include "wagtailadmin/shared/field.html" %}
+                </li>
             {% endfor %}
 
             <li>
diff --git a/wagtail/contrib/redirects/templates/wagtailredirects/choose_import_file.html b/wagtail/contrib/redirects/templates/wagtailredirects/choose_import_file.html
index 5f7bd0694269..901ef7f90ae3 100644
--- a/wagtail/contrib/redirects/templates/wagtailredirects/choose_import_file.html
+++ b/wagtail/contrib/redirects/templates/wagtailredirects/choose_import_file.html
@@ -23,7 +23,9 @@
 
         <ul class="fields">
             {% for field in form.visible_fields %}
-                {% include "wagtailadmin/shared/field_as_li.html" %}
+                <li>
+                    {% include "wagtailadmin/shared/field.html" %}
+                </li>
             {% endfor %}
 
             <li>
diff --git a/wagtail/contrib/redirects/templates/wagtailredirects/confirm_import.html b/wagtail/contrib/redirects/templates/wagtailredirects/confirm_import.html
index 39088be6992b..dd227a7c5f79 100644
--- a/wagtail/contrib/redirects/templates/wagtailredirects/confirm_import.html
+++ b/wagtail/contrib/redirects/templates/wagtailredirects/confirm_import.html
@@ -16,7 +16,9 @@
 
         <ul class="fields">
             {% for field in form.visible_fields %}
-                {% include "wagtailadmin/shared/field_as_li.html" %}
+                <li>
+                    {% include "wagtailadmin/shared/field.html" %}
+                </li>
             {% endfor %}
 
             <li>
diff --git a/wagtail/contrib/redirects/templates/wagtailredirects/edit.html b/wagtail/contrib/redirects/templates/wagtailredirects/edit.html
index c9c81cb03487..535b4c371c58 100644
--- a/wagtail/contrib/redirects/templates/wagtailredirects/edit.html
+++ b/wagtail/contrib/redirects/templates/wagtailredirects/edit.html
@@ -12,7 +12,9 @@
 
         <ul class="fields">
             {% for field in form.visible_fields %}
-                {% include "wagtailadmin/shared/field_as_li.html" %}
+                <li>
+                    {% include "wagtailadmin/shared/field.html" %}
+                </li>
             {% endfor %}
 
             <li>
diff --git a/wagtail/contrib/simple_translation/templates/simple_translation/admin/submit_translation.html b/wagtail/contrib/simple_translation/templates/simple_translation/admin/submit_translation.html
index 91fb696e3d19..895e1cbf03fd 100644
--- a/wagtail/contrib/simple_translation/templates/simple_translation/admin/submit_translation.html
+++ b/wagtail/contrib/simple_translation/templates/simple_translation/admin/submit_translation.html
@@ -18,7 +18,9 @@
             <ul class="fields">
                 {% block visible_fields %}
                     {% for field in form.visible_fields %}
-                        {% include "wagtailadmin/shared/field_as_li.html" %}
+                        <li>
+                            {% include "wagtailadmin/shared/field.html" %}
+                        </li>
                     {% endfor %}
                 {% endblock %}
                 {% if form.show_submit %}
diff --git a/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html
index f8829701afb6..6f7ac1e87ec5 100644
--- a/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html
@@ -472,7 +472,9 @@ <h3>Mixtures</h3>
                         {% if field.name == 'file' %}
                             {% include "wagtailimages/images/_file_field.html" %}
                         {% else %}
-                            {% include "wagtailadmin/shared/field_as_li.html" %}
+                            <li>
+                                {% include "wagtailadmin/shared/field.html" %}
+                            </li>
                         {% endif %}
                     {% endfor %}
                     <li><button type="submit" class="button">{% trans 'Save' %}</button><a href="#" class="button no">{% trans "Delete image" %}</a></li>
diff --git a/wagtail/documents/templates/wagtaildocs/documents/add.html b/wagtail/documents/templates/wagtaildocs/documents/add.html
index afd985cb272a..c9dcdcd3e80f 100644
--- a/wagtail/documents/templates/wagtaildocs/documents/add.html
+++ b/wagtail/documents/templates/wagtaildocs/documents/add.html
@@ -57,7 +57,9 @@
                     {% if field.is_hidden %}
                         {{ field }}
                     {% else %}
-                        {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                        <li>
+                            {% include "wagtailadmin/shared/field.html" with field=field %}
+                        </li>
                     {% endif %}
                 {% endfor %}
                 <li>
diff --git a/wagtail/documents/templates/wagtaildocs/documents/edit.html b/wagtail/documents/templates/wagtaildocs/documents/edit.html
index ca8035697337..ac9bb0196e47 100644
--- a/wagtail/documents/templates/wagtaildocs/documents/edit.html
+++ b/wagtail/documents/templates/wagtaildocs/documents/edit.html
@@ -32,7 +32,9 @@
                         {% elif field.is_hidden %}
                             {{ field }}
                         {% else %}
-                            {% include "wagtailadmin/shared/field_as_li.html" %}
+                            <li>
+                                {% include "wagtailadmin/shared/field.html" %}
+                            </li>
                         {% endif %}
                     {% endfor %}
                     <li>
diff --git a/wagtail/embeds/templates/wagtailembeds/chooser/chooser.html b/wagtail/embeds/templates/wagtailembeds/chooser/chooser.html
index 9a2082eddbf4..4a05635c655e 100644
--- a/wagtail/embeds/templates/wagtailembeds/chooser/chooser.html
+++ b/wagtail/embeds/templates/wagtailembeds/chooser/chooser.html
@@ -9,7 +9,9 @@
             {% csrf_token %}
             <ul class="fields">
                 {% for field in form %}
-                    {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                    <li>
+                        {% include "wagtailadmin/shared/field.html" with field=field %}
+                    </li>
                 {% endfor %}
                 <li>
                     <button
diff --git a/wagtail/images/templates/wagtailimages/chooser/chooser.html b/wagtail/images/templates/wagtailimages/chooser/chooser.html
index 7f64a30cf2d8..cb8408838386 100644
--- a/wagtail/images/templates/wagtailimages/chooser/chooser.html
+++ b/wagtail/images/templates/wagtailimages/chooser/chooser.html
@@ -5,7 +5,9 @@
     <form data-chooser-modal-search action="{{ results_url }}" method="GET" autocomplete="off" novalidate>
         <ul class="fields">
             {% for field in filter_form %}
-                {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                <li>
+                    {% include "wagtailadmin/shared/field.html" with field=field %}
+                </li>
             {% endfor %}
             {% if popular_tags %}
                 <li class="taglist w-label-3">
diff --git a/wagtail/images/templates/wagtailimages/images/add.html b/wagtail/images/templates/wagtailimages/images/add.html
index 9f2fc3a6173b..5d24620a8eee 100644
--- a/wagtail/images/templates/wagtailimages/images/add.html
+++ b/wagtail/images/templates/wagtailimages/images/add.html
@@ -58,7 +58,9 @@
                     {% if field.is_hidden %}
                         {{ field }}
                     {% else %}
-                        {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                        <li>
+                            {% include "wagtailadmin/shared/field.html" with field=field %}
+                        </li>
                     {% endif %}
                 {% endfor %}
                 <li><input type="submit" value="{% trans 'Save' %}" class="button" /></li>
diff --git a/wagtail/search/templates/wagtailsearch/queries/chooser/chooser.html b/wagtail/search/templates/wagtailsearch/queries/chooser/chooser.html
index 063b483dfb8e..4266b33dfb16 100644
--- a/wagtail/search/templates/wagtailsearch/queries/chooser/chooser.html
+++ b/wagtail/search/templates/wagtailsearch/queries/chooser/chooser.html
@@ -6,7 +6,9 @@
     <form class="query-search full-width" action="{% url 'wagtailsearch_admin:queries_chooserresults' %}" method="GET" autocomplete="off" novalidate>
         <ul class="fields">
             {% for field in searchform %}
-                {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                <li>
+                    {% include "wagtailadmin/shared/field.html" with field=field %}
+                </li>
             {% endfor %}
             <li class="submit"><input type="submit" value="{% trans 'Search' %}" class="button" /></li>
         </ul>
diff --git a/wagtail/test/testapp/templates/tests/generic_view_templates/edit.html b/wagtail/test/testapp/templates/tests/generic_view_templates/edit.html
index 343cf467c15a..c02e8c6f25c1 100644
--- a/wagtail/test/testapp/templates/tests/generic_view_templates/edit.html
+++ b/wagtail/test/testapp/templates/tests/generic_view_templates/edit.html
@@ -6,7 +6,9 @@
         <div class="tab-content">
             {% csrf_token %}
             <ul class="fields">
-                {% include "wagtailadmin/shared/field_as_li.html" with field=form.content %}
+                <li>
+                    {% include "wagtailadmin/shared/field.html" with field=form.content %}
+                </li>
                 <li>
                     <input type="submit" value="Save" class="button"/>
                 </li>
diff --git a/wagtail/users/templates/wagtailusers/groups/create.html b/wagtail/users/templates/wagtailusers/groups/create.html
index 6a1a87423a97..592e68aeb7bf 100644
--- a/wagtail/users/templates/wagtailusers/groups/create.html
+++ b/wagtail/users/templates/wagtailusers/groups/create.html
@@ -20,7 +20,9 @@
 
             <ul class="fields">
                 {% block fields %}
-                    {% include "wagtailadmin/shared/field_as_li.html" with field=form.name %}
+                    <li>
+                        {% include "wagtailadmin/shared/field.html" with field=form.name %}
+                    </li>
                     {% block extra_fields %}{% endblock extra_fields %}
                 {% endblock fields %}
                 <li>
diff --git a/wagtail/users/templates/wagtailusers/users/create.html b/wagtail/users/templates/wagtailusers/users/create.html
index 79cffee85de5..bd54f3e3e59f 100644
--- a/wagtail/users/templates/wagtailusers/users/create.html
+++ b/wagtail/users/templates/wagtailusers/users/create.html
@@ -29,17 +29,29 @@
                     <ul class="fields">
                         {% block fields %}
                             {% if form.separate_username_field %}
-                                {% include "wagtailadmin/shared/field_as_li.html" with field=form.username_field %}
+                                <li>
+                                    {% include "wagtailadmin/shared/field.html" with field=form.username_field %}
+                                </li>
                             {% endif %}
-                            {% include "wagtailadmin/shared/field_as_li.html" with field=form.email %}
-                            {% include "wagtailadmin/shared/field_as_li.html" with field=form.first_name %}
-                            {% include "wagtailadmin/shared/field_as_li.html" with field=form.last_name %}
+                            <li>
+                                {% include "wagtailadmin/shared/field.html" with field=form.email %}
+                            </li>
+                            <li>
+                                {% include "wagtailadmin/shared/field.html" with field=form.first_name %}
+                            </li>
+                            <li>
+                                {% include "wagtailadmin/shared/field.html" with field=form.last_name %}
+                            </li>
                             {% block extra_fields %}{% endblock extra_fields %}
                             {% if form.password1 %}
-                                {% include "wagtailadmin/shared/field_as_li.html" with field=form.password1 %}
+                                <li>
+                                    {% include "wagtailadmin/shared/field.html" with field=form.password1 %}
+                                </li>
                             {% endif %}
                             {% if form.password2 %}
-                                {% include "wagtailadmin/shared/field_as_li.html" with field=form.password2 %}
+                                <li>
+                                    {% include "wagtailadmin/shared/field.html" with field=form.password2 %}
+                                </li>
                             {% endif %}
                         {% endblock fields %}
 
@@ -59,8 +71,12 @@
                     aria-labelledby="tab-label-roles"
                 >
                     <ul class="fields">
-                        {% include "wagtailadmin/shared/field_as_li.html" with field=form.is_superuser %}
-                        {% include "wagtailadmin/shared/field_as_li.html" with field=form.groups %}
+                        <li>
+                            {% include "wagtailadmin/shared/field.html" with field=form.is_superuser %}
+                        </li>
+                        <li>
+                            {% include "wagtailadmin/shared/field.html" with field=form.groups %}
+                        </li>
                         <li><button class="button">{% trans "Add user" %}</button></li>
                     </ul>
                 </section>
diff --git a/wagtail/users/templates/wagtailusers/users/edit.html b/wagtail/users/templates/wagtailusers/users/edit.html
index 1ff0274050fe..ab23712fa73a 100644
--- a/wagtail/users/templates/wagtailusers/users/edit.html
+++ b/wagtail/users/templates/wagtailusers/users/edit.html
@@ -30,20 +30,34 @@
                     <ul class="fields">
                         {% block fields %}
                             {% if form.separate_username_field %}
-                                {% include "wagtailadmin/shared/field_as_li.html" with field=form.username_field %}
+                                <li>
+                                    {% include "wagtailadmin/shared/field.html" with field=form.username_field %}
+                                </li>
                             {% endif %}
-                            {% include "wagtailadmin/shared/field_as_li.html" with field=form.email %}
-                            {% include "wagtailadmin/shared/field_as_li.html" with field=form.first_name %}
-                            {% include "wagtailadmin/shared/field_as_li.html" with field=form.last_name %}
+                            <li>
+                                {% include "wagtailadmin/shared/field.html" with field=form.email %}
+                            </li>
+                            <li>
+                                {% include "wagtailadmin/shared/field.html" with field=form.first_name %}
+                            </li>
+                            <li>
+                                {% include "wagtailadmin/shared/field.html" with field=form.last_name %}
+                            </li>
                             {% block extra_fields %}{% endblock extra_fields %}
                             {% if form.password1 %}
-                                {% include "wagtailadmin/shared/field_as_li.html" with field=form.password1 %}
+                                <li>
+                                    {% include "wagtailadmin/shared/field.html" with field=form.password1 %}
+                                </li>
                             {% endif %}
                             {% if form.password2 %}
-                                {% include "wagtailadmin/shared/field_as_li.html" with field=form.password2 %}
+                                <li>
+                                    {% include "wagtailadmin/shared/field.html" with field=form.password2 %}
+                                </li>
                             {% endif %}
                             {% if form.is_active %}
-                                {% include "wagtailadmin/shared/field_as_li.html" with field=form.is_active %}
+                                <li>
+                                    {% include "wagtailadmin/shared/field.html" with field=form.is_active %}
+                                </li>
                             {% endif %}
 
                         {% endblock fields %}
@@ -64,10 +78,14 @@
                 >
                     <ul class="fields">
                         {% if form.is_superuser %}
-                            {% include "wagtailadmin/shared/field_as_li.html" with field=form.is_superuser %}
+                            <li>
+                                {% include "wagtailadmin/shared/field.html" with field=form.is_superuser %}
+                            </li>
                         {% endif %}
 
-                        {% include "wagtailadmin/shared/field_as_li.html" with field=form.groups %}
+                        <li>
+                            {% include "wagtailadmin/shared/field.html" with field=form.groups %}
+                        </li>
                         <li>
                             <input type="submit" value="{% trans 'Save' %}" class="button"/>
                             {% if can_delete %}