diff --git a/uauth/organization/templates/organization/base.html b/uauth/organization/templates/organization/base.html
index ba275fb..8c595a1 100644
--- a/uauth/organization/templates/organization/base.html
+++ b/uauth/organization/templates/organization/base.html
@@ -4,6 +4,6 @@
 {% block logout-url %}{% url "logout" %}{% endblock %}
 
 {% block more-user-links %}
-  {{ block.super }}
-  <a href="{% url "manage-users" organization.slug %}">{% trans 'User management' %}</a>
-  {% endblock %}
+  <a href="{% url "organization-home" organization.slug %}" class="icon-home-space">{% trans 'Homepage' %}</a>
+  <a href="{% url "manage" organization.slug %}">{% trans 'Management' %}</a>
+{% endblock %}
diff --git a/uauth/organization/templates/organization/manage.html b/uauth/organization/templates/organization/manage.html
index f8dd9ab..e47c5d3 100644
--- a/uauth/organization/templates/organization/manage.html
+++ b/uauth/organization/templates/organization/manage.html
@@ -1,2 +1,8 @@
-{% extends "uauth/base.html" %}
+{% extends "organization/base.html" %}
 {% load i18n %}
+
+{% block content %}
+<ul class="apps">
+  <li class="users"><a href="{% url 'manage-users' organization.slug %}">{% trans 'Users' %}</a></li>
+</ul>
+{% endblock %}
diff --git a/uauth/organization/views.py b/uauth/organization/views.py
index 1270ff0..fb66fd2 100644
--- a/uauth/organization/views.py
+++ b/uauth/organization/views.py
@@ -33,7 +33,7 @@ class OrganizationMixin(object):
         ctx['organization'] = Organization.objects.get(slug=self.kwargs['organization_slug'])
         return ctx
 
-class ManageView(TemplateView):
+class ManageView(OrganizationMixin, TemplateView):
     template_name = 'organization/manage.html'
 
 manage = ManageView.as_view()
diff --git a/uauth/static/css/icons/icon-personnes-hover.png b/uauth/static/css/icons/icon-personnes-hover.png
new file mode 100644
index 0000000..7e8ec4a
Binary files /dev/null and b/uauth/static/css/icons/icon-personnes-hover.png differ
diff --git a/uauth/static/css/icons/icon-personnes.png b/uauth/static/css/icons/icon-personnes.png
new file mode 100644
index 0000000..af29363
Binary files /dev/null and b/uauth/static/css/icons/icon-personnes.png differ
diff --git a/uauth/static/css/style.css b/uauth/static/css/style.css
index 760ffd6..12bb306 100644
--- a/uauth/static/css/style.css
+++ b/uauth/static/css/style.css
@@ -71,4 +71,7 @@ div.example {
     background: #eee;
     border: 1px solid #bbb;
     font-family: Monospace;
-}
\ No newline at end of file
+}
+
+/* icons */
+li.users a {background-image: url(icons/icon-personnes.png);}
\ No newline at end of file