diff --git a/ckan/templates/group/confirm_delete_member.html b/ckan/templates/group/confirm_delete_member.html
new file mode 100644
index 00000000000..c5f72ae9349
--- /dev/null
+++ b/ckan/templates/group/confirm_delete_member.html
@@ -0,0 +1,20 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %}
+
+{% block maintag %}<div class="row" role="main">{% endblock %}
+
+{% block main_content %}
+  <section class="module span6 offset3">
+    <div class="module-content">
+      <p>{{ _('Are you sure you want to delete member - {name}?').format(name=c.user_dict.name) }}</p>
+      <p class="form-actions">
+      <form action="{% url_for controller='group', action='member_delete', id=c.group_id %}" method="post">
+        <input type="hidden" name="user" value="{{ c.user_id }}" />
+        <button class="btn" type="submit" name="cancel" >{{ _('Cancel') }}</button>
+        <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Delete') }}</button>
+      </form>
+      </p>
+    </div>
+  </section>
+{% endblock %}
diff --git a/ckan/templates/group/member_new.html b/ckan/templates/group/member_new.html
new file mode 100644
index 00000000000..f4ca100635c
--- /dev/null
+++ b/ckan/templates/group/member_new.html
@@ -0,0 +1,48 @@
+{% extends "page.html" %}
+{% import 'macros/form.html' as form %}
+
+{% block subtitle %}{{ c.group_dict.display_name }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li>{% link_for _('Groups'), controller='group', action='index' %}</li>
+  <li class="active">{% link_for c.group_dict.display_name|truncate(35), controller='group', action='read', id=c.group_dict.name %}</li>
+{% endblock %}
+
+{% block actions_content %}
+  {% if h.check_access('organization_member_create', {'id': c.group_dict.id}) %}
+    <li>{% link_for _('Members'), controller='group', action='members', id=c.group_dict.id, class_='btn' %}</li>
+  {% endif %}
+{% endblock %}
+
+{% block primary_content %}
+  <section class="module">
+    <div class="module-content">
+      {% if c.user_name %}
+        <h1 class="page-heading">{{ _('Edit Member:') }} {{ c.user_name }}</h1>
+      {% else %}
+        <h1 class="page-heading">{{ _('Add Member') }}</h1>
+      {% endif %}
+      <form class="dataset-form form-horizontal" method='post'>
+        {% if c.user_name %}
+            <input type="hidden" name="username" value="{{ c.user_name }}" />
+        {% else %}
+          {% set format_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/user/autocomplete?q=?'} %}
+          {{ form.input('username', id='field-username', label=_('User'), placeholder=_('Username'), value='', error='', classes=['control-medium'], attrs=format_attrs) }}
+        {% endif %}
+        {% set format_attrs = {'data-module': 'autocomplete'} %}
+        {{ form.select('role', label=_('Role'), options=c.roles, selected='', error='', attrs=format_attrs) }}
+        <button class="btn btn-primary" type="submit" name="submit" >{{ _('Add') }}</button>
+      </form>
+    </div>
+  </section>
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet 'snippets/group.html', group=c.group_dict %}
+
+{% endblock %}
+
+{% block links %}
+  {{ super() }}
+  {% include "group/snippets/feeds.html" %}
+{% endblock %}
diff --git a/ckan/templates/group/members.html b/ckan/templates/group/members.html
new file mode 100644
index 00000000000..91dbc3ca055
--- /dev/null
+++ b/ckan/templates/group/members.html
@@ -0,0 +1,43 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ c.group_dict.display_name }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li>{% link_for _('Groups'), controller='group', action='index' %}</li>
+  <li class="active">{% link_for c.group_dict.display_name|truncate(35), controller='group', action='read', id=c.group_dict.name %}</li>
+{% endblock %}
+
+{% block actions_content %}
+  {% if h.check_access('organization_member_create', {'id': c.group_dict.id}) %}
+    <li>{% link_for _('Add Member'), controller='group', action='member_new', id=c.group_dict.id, class_='btn', icon='plus' %}</li>
+  {% endif %}
+{% endblock %}
+
+{% block primary_content %}
+  <section class="module">
+    <div class="module-content">
+      <h1 class="page-heading">{{ _('Members') }}</h1>
+      <table class="table table-bordered">
+        {% for user_id, user, role in c.members %}
+        <tr>
+          <td class="media">{{ h.linked_user(user_id, maxlength=20) }}</td>
+          <td>{{ role }}</td>
+          <td>{% link_for _('Edit'), controller='group', action='member_new', id=c.group_dict.id, class_='btn', user=user_id %}</td>
+          {% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %}
+          <td><a class="btn btn-danger" href="{% url_for controller='group', action='member_delete', id=c.group_dict.id, user=user_id %}" data-module="confirm-action" data-module-i18n="{{ locale }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a></td>
+        </tr>
+        {% endfor %}
+      </table>
+    </div>
+  </section>
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet 'snippets/group.html', group=c.group_dict %}
+
+{% endblock %}
+
+{% block links %}
+  {{ super() }}
+  {% include "group/snippets/feeds.html" %}
+{% endblock %}
diff --git a/ckan/templates/organization/confirm_delete_member.html b/ckan/templates/organization/confirm_delete_member.html
new file mode 100644
index 00000000000..62ddd2f8f2d
--- /dev/null
+++ b/ckan/templates/organization/confirm_delete_member.html
@@ -0,0 +1,20 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %}
+
+{% block maintag %}<div class="row" role="main">{% endblock %}
+
+{% block main_content %}
+  <section class="module span6 offset3">
+    <div class="module-content">
+      <p>{{ _('Are you sure you want to delete member - {name}?').format(name=c.user_dict.name) }}</p>
+      <p class="form-actions">
+      <form action="{% url_for controller='organization', action='member_delete', id=c.group_id %}" method="post">
+        <input type="hidden" name="user" value="{{ c.user_id }}" />
+        <button class="btn" type="submit" name="cancel" >{{ _('Cancel') }}</button>
+        <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Delete') }}</button>
+      </form>
+      </p>
+    </div>
+  </section>
+{% endblock %}
diff --git a/ckan/templates/organization/member_new.html b/ckan/templates/organization/member_new.html
new file mode 100644
index 00000000000..dc5309c743d
--- /dev/null
+++ b/ckan/templates/organization/member_new.html
@@ -0,0 +1,48 @@
+{% extends "page.html" %}
+{% import 'macros/form.html' as form %}
+
+{% block subtitle %}{{ c.group_dict.display_name }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li>{% link_for _('Organizations'), controller='organization', action='index' %}</li>
+  <li class="active">{% link_for c.group_dict.display_name|truncate(35), controller='organization', action='read', id=c.group_dict.name %}</li>
+{% endblock %}
+
+{% block actions_content %}
+  {% if h.check_access('organization_member_create', {'id': c.group_dict.id}) %}
+    <li>{% link_for _('Members'), controller='organization', action='members', id=c.group_dict.id, class_='btn' %}</li>
+  {% endif %}
+{% endblock %}
+
+{% block primary_content %}
+  <section class="module">
+    <div class="module-content">
+      {% if c.user_name %}
+        <h1 class="page-heading">{{ _('Edit Member:') }} {{ c.user_name }}</h1>
+      {% else %}
+        <h1 class="page-heading">{{ _('Add Member') }}</h1>
+      {% endif %}
+      <form class="dataset-form form-horizontal" method='post'>
+        {% if c.user_name %}
+            <input type="hidden" name="username" value="{{ c.user_name }}" />
+        {% else %}
+          {% set format_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/user/autocomplete?q=?'} %}
+          {{ form.input('username', id='field-username', label=_('User'), placeholder=_('Username'), value='', error='', classes=['control-medium'], attrs=format_attrs) }}
+        {% endif %}
+        {% set format_attrs = {'data-module': 'autocomplete'} %}
+        {{ form.select('role', label=_('Role'), options=c.roles, selected='', error='', attrs=format_attrs) }}
+        <button class="btn btn-primary" type="submit" name="submit" >{{ _('Add') }}</button>
+      </form>
+    </div>
+  </section>
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet 'snippets/organization.html', organization=c.group_dict %}
+
+{% endblock %}
+
+{% block links %}
+  {{ super() }}
+  {% include "organization/snippets/feeds.html" %}
+{% endblock %}