diff --git a/ckanext/portalopendatadk/templates/organization/member_new.html b/ckanext/portalopendatadk/templates/organization/member_new.html
index 6d8ef06..c6a8d48 100644
--- a/ckanext/portalopendatadk/templates/organization/member_new.html
+++ b/ckanext/portalopendatadk/templates/organization/member_new.html
@@ -2,76 +2,61 @@
 
 {% import 'macros/form.html' as form %}
 
-{% set user = user_dict %}
+{% set user = c.user_dict %}
 
-{% block subtitle %}{{ _('Edit Member') if user else _('Add Member') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Edit Member') if user else _('Add Member') }} - {{ super() }}{% endblock %}
 
 {% block primary_content_inner %}
-  {% link_for _('Back to all members'), named_route=group_type+'.members', id=organization.name, class_='btn btn-default pull-right', icon='arrow-left' %}
+  {% link_for _('Back to all members'), controller='organization', action='members', id=organization.name, class_='btn pull-right', icon='arrow-left' %}
   <h1 class="page-heading">
     {% block page_heading %}{{ _('Edit Member') if user else _('Add Member') }}{% endblock %}
   </h1>
   {% block form %}
-  <form class="dataset-form add-member-form" method='post'>
-    {{ h.csrf_input() }}
-    <div class="row">
-      <div class="col-md-5">
-        <div class="form-group control-medium">
-          {% if not user %}
-            <label class="form-label" for="username">
-              {{ _('Existing User') }}
-            </label>
-            <p>
-              {{ _('If you wish to add an existing user, search for their username below.') }}
-            </p>
+  <form class="dataset-form form-horizontal add-member-form" method='post'>
+    <div class="row-fluid">
+      <div class="control-group control-medium">
+        {% if not user %}
+          <label class="control-label" for="username">
+            {{ _('Existing User') }}
+          </label>
+          <span>
+            {{ _('If you wish to add an existing user, search for their username below.') }}
+          </span>
+        {% endif %}
+        <div class="controls">
+          {% if user %}
+            <input type="hidden" name="username" value="{{ user.name }}" />
+            <input id="username" name="username" type="text" value="{{ user.name }}"
+            disabled="True" class="control-medium">
+          {% else %}
+             <input id="username" type="text" name="username" placeholder="{{ _('Username') }}"
+            value="" class="control-medium" data-module="autocomplete"
+            data-module-source="/api/2/util/user/autocomplete?q=?">
           {% endif %}
-          <div class="controls">
-            {% if user %}
-              <input type="hidden" name="username" value="{{ user.name }}" />
-              <input id="username" name="username" type="text" value="{{ user.name }}"
-              disabled="True" class="form-control">
-            {% else %}
-                <input id="username" type="text" name="username" placeholder="{{ _('Username') }}"
-                value="" class="control-medium" data-module="autocomplete"
-                data-module-source="/api/2/util/user/autocomplete?ignore_self=true&q=?">
-            {% endif %}
-          </div>
         </div>
       </div>
       {% if c.userobj.sysadmin %}
-      <div class="col-md-2 add-member-or-wrap">
         <div class="add-member-or">
           {{ _('or') }}
         </div>
-      </div>
-      <div class="col-md-5">
-        <div class="form-group control-medium">
-          <label class="form-label" for="email">
+        <div class="control-group control-medium">
+          <label class="control-label" for="email">
             {{ _('New User') }}
           </label>
-          <p>
+          <span>
             {{ _('If you wish to invite a new user, enter their email address.') }}
-          </p>
+          </span>
           <div class="controls">
-            <input id="email" type="email" name="email" class="form-control" placeholder="{{ _('Email address') }}" >
+            <input id="email" type="email" name="email" placeholder="{{ _('Email address') }}" >
           </div>
         </div>
-      </div>
       {% endif %}
     </div>
-
-    {% if user and user.name == c.user and user_role == 'admin' %}
-      {% set format_attrs = {'data-module': 'autocomplete', 'disabled': 'disabled'} %}
-      {{ form.select('role', label=_('Role'), options=roles, selected=user_role, error='', attrs=format_attrs) }}
-      {{ form.hidden('role', value=user_role) }}
-    {% else %}
-      {% set format_attrs = {'data-module': 'autocomplete'} %}
-      {{ form.select('role', label=_('Role'), options=roles, selected=user_role, error='', attrs=format_attrs) }}
-    {% endif %}
-
+    {% set format_attrs = {'data-module': 'autocomplete'} %}
+    {{ form.select('role', label=_('Role'), options=c.roles, selected=c.user_role, error='', attrs=format_attrs) }}
     <div class="form-actions">
       {% if user %}
-        <a href="{{ h.url_for(group_type + '.member_delete', id=group_dict.id, user=user.id) }}" class="btn btn-danger pull-left" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}">{{ _('Delete') }}</a>
+        <a href="{% url_for controller='organization', action='member_delete', id=c.group_dict.id, user=user.id %}" class="btn btn-danger pull-left" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}">{{ _('Delete') }}</a>
         <button class="btn btn-primary" type="submit" name="submit" >
           {{ _('Update Member') }}
         </button>
@@ -102,5 +87,4 @@ <h2 class="module-heading">
         datasets, but not add new datasets.</p>
     {% endtrans %}
   </div>
-</div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file