diff --git a/ckanext/scheming/templates/scheming/group/group_form.html b/ckanext/scheming/templates/scheming/group/group_form.html
index b3cf2c9b..a964508f 100644
--- a/ckanext/scheming/templates/scheming/group/group_form.html
+++ b/ckanext/scheming/templates/scheming/group/group_form.html
@@ -29,6 +29,22 @@
           {% endif %}
         {% endif %}
         {% endblock %}
-        <button class="btn btn-primary" name="save" type="submit">{% block save_text %}{{ _('Save Group') }}{% endblock %}</button>
+        <button class="btn btn-primary" name="save" type="submit">
+          {% block save_text %}
+              {%- if action == "edit" -%}
+                {%- if 'humanize_entity_type' in h -%}
+                  {{ h.humanize_entity_type('group', group_type, 'update label') or _('Update Group') }}
+                {%- else -%}
+                  {{ _('Update Group') }}
+                {%- endif -%}
+              {%- else -%}
+                {%- if 'humanize_entity_type' in h -%}
+                  {{ h.humanize_entity_type('group', group_type, 'create label') or _('Create Group') }}
+                {%- else -%}
+                  {{ _('Create Group') }}
+                {%- endif -%}
+              {%- endif -%}
+            {% endblock %}
+        </button>
     </div>
 </form>
diff --git a/ckanext/scheming/templates/scheming/organization/group_form.html b/ckanext/scheming/templates/scheming/organization/group_form.html
index ebf78de7..b0dcc366 100644
--- a/ckanext/scheming/templates/scheming/organization/group_form.html
+++ b/ckanext/scheming/templates/scheming/organization/group_form.html
@@ -37,13 +37,13 @@
             {% block save_text %}
               {%- if action == "edit" -%}
                 {%- if 'humanize_entity_type' in h -%}
-                  {{ h.humanize_entity_type('organization', group_type, 'update label') }}
+                  {{ h.humanize_entity_type('organization', group_type, 'update label') or _('Update Organization') }}
                 {%- else -%}
                   {{ _('Update Organization') }}
                 {%- endif -%}
               {%- else -%}
                 {%- if 'humanize_entity_type' in h -%}
-                  {{ h.humanize_entity_type('organization', group_type, 'create label') }}
+                  {{ h.humanize_entity_type('organization', group_type, 'create label') or _('Create Organization') }}
                 {%- else -%}
                   {{ _('Create Organization') }}
                 {%- endif -%}