diff --git a/wagtail/users/templates/wagtailusers/groups/create.html b/wagtail/users/templates/wagtailusers/groups/create.html
index 7637df8491..dd5dd0b97a 100644
--- a/wagtail/users/templates/wagtailusers/groups/create.html
+++ b/wagtail/users/templates/wagtailusers/groups/create.html
@@ -1,26 +1,28 @@
 {% extends "wagtailadmin/generic/create.html" %}
 {% load wagtailusers_tags i18n wagtailadmin_tags %}
 
-{% block main_content %}
-    <form action="{% url 'wagtailusers_groups:add' %}" method="POST" novalidate>
-        {% csrf_token %}
+{% block form_content %}
+    {% block fields %}
+        {% comment %}
+            This block is not documented, but developers might assume its existence
+            based on the docs for custom user forms.
+        {% endcomment %}
+
+        {% panel id="name" heading=form.name.label id_for_label=form.name.id_for_label is_required=True %}
+            {% formattedfield field=form.name show_label=False %}
+        {% endpanel %}
+
+        <div class="w-form-width">
+            {# This block is documented in the docs for customizing group views #}
+            {% block extra_fields %}{% endblock extra_fields %}
+
+            {% format_permissions permission_bound_field=form.permissions %}
 
-        <ul class="fields">
-            {% block fields %}
-                <li>{% formattedfield form.name %}</li>
-                {% block extra_fields %}{% endblock extra_fields %}
-            {% endblock fields %}
-            <li>
-                {% format_permissions permission_bound_field=form.permissions %}
-            </li>
             {% for panel in permission_panels %}
-                <li>
-                    {{ panel.as_admin_panel }}
-                </li>
+                {{ panel.as_admin_panel }}
             {% endfor %}
-            <li><input type="submit" value="{% trans 'Add group' %}" class="button" /></li>
-        </ul>
-    </form>
+        </div>
+    {% endblock %}
 {% endblock %}
 
 {% block extra_js %}
diff --git a/wagtail/users/templates/wagtailusers/groups/edit.html b/wagtail/users/templates/wagtailusers/groups/edit.html
index 91cddcc147..6126d97161 100644
--- a/wagtail/users/templates/wagtailusers/groups/edit.html
+++ b/wagtail/users/templates/wagtailusers/groups/edit.html
@@ -1,40 +1,2 @@
-{% extends "wagtailadmin/generic/edit.html" %}
-{% load wagtailusers_tags wagtailadmin_tags i18n %}
-
-{% block main_content %}
-    <form action="{% url 'wagtailusers_groups:edit' group.id %}" method="POST" novalidate>
-        {% csrf_token %}
-
-        <div class="fields">
-            {% block fields %}
-                {% panel id="name" heading=form.name.label id_for_label=form.name.id_for_label is_required=True %}
-                    {% formattedfield field=form.name show_label=False %}
-                {% endpanel %}
-                {% block extra_fields %}{% endblock extra_fields %}
-            {% endblock fields %}
-
-            <div>
-                {% format_permissions permission_bound_field=form.permissions %}
-            </div>
-
-            {% for panel in permission_panels %}
-                <div>
-                    {{ panel.as_admin_panel }}
-                </div>
-            {% endfor %}
-            <div>
-                <input type="submit" value="{% trans 'Save' %}" class="button" />
-
-                {% if perms.auth.delete_group %}
-                    <a href="{% url 'wagtailusers_groups:delete' group.id %}" class="button no">{% trans "Delete group" %}</a>
-                {% endif %}
-            </div>
-        </div>
-
-    </form>
-{% endblock %}
-
-{% block extra_js %}
-    {{ block.super }}
-    {% include "wagtailusers/groups/includes/group_form_js.html" %}
-{% endblock %}
+{% extends "wagtailusers/groups/create.html" %}
+{# The built-in templates are now identical. #}