diff --git a/ckan/templates/group/base_form_page.html b/ckan/templates/group/base_form_page.html
index 78c84c0babb..720246d6446 100644
--- a/ckan/templates/group/base_form_page.html
+++ b/ckan/templates/group/base_form_page.html
@@ -1,4 +1,4 @@
-{% extends "page.html" %}
+{% extends "group/index.html" %}
 
 {% block breadcrumb_content %}
   <li>{{ h.nav_link(_('Groups'), controller='group', action='index') }}</li>
@@ -15,17 +15,3 @@ <h1 class="page-heading">{% block page_heading %}{{ _('Group Form') }}{% endbloc
     </div>
   </div>
 {% endblock %}
-
-{% block secondary_content %}
-  <div class="module module-narrow module-shallow">
-    <h2 class="module-heading"><i class="icon-large icon-info-sign"></i> {{ _('What are Groups?') }}</h2>
-    <div class="module-content">
-      {% trans %}
-        <p>Whilst tags are great at collecting datasets together, there are
-        occasions when you want to restrict users from editing a collection.</p>
-        <p>A group can be set-up to specify which users have permission to add or
-        remove datasets from it.</p>
-      {% endtrans %}
-    </div>
-  </div>
-{% endblock %}
diff --git a/ckan/templates/organization/edit.html b/ckan/templates/organization/edit.html
index 4de39ad1385..e08dce64d60 100644
--- a/ckan/templates/organization/edit.html
+++ b/ckan/templates/organization/edit.html
@@ -3,3 +3,9 @@
 {% block subtitle %}{{ _('Edit a Organization') }}{% endblock %}
 
 {% block page_heading %}{{ _('Edit a Organization') }}{% endblock %}
+
+{% block secondary_content %}
+  {% if organization %}
+    {% snippet 'snippets/organization.html', organization=organization %}
+  {% endif %}
+{% endblock %}
diff --git a/ckan/templates/organization/edit_base.html b/ckan/templates/organization/edit_base.html
index 5d9c9ac8a8b..7e0b50dd2e8 100644
--- a/ckan/templates/organization/edit_base.html
+++ b/ckan/templates/organization/edit_base.html
@@ -1,4 +1,4 @@
-{% extends "page.html" %}
+{% extends "organization/index.html" %}
 
 {% set organization = c.group_dict %}
 
@@ -43,6 +43,7 @@
 {% endblock %}
 
 {% block secondary_content %}
+  {{ super() }}
   {% if organization %}
     {% snippet 'snippets/organization.html', organization=organization %}
   {% endif %}