diff --git a/apps/member/views.py b/apps/member/views.py
index 651462a..7c0b32e 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -217,7 +217,7 @@ class ProfileListView(AdminMixin, SingleTableView):
     queryset = TFJMUser.objects.order_by("role", "last_name", "first_name")
     table_class = UserTable
     template_name = "member/profile_list.html"
-    extra_context = dict(title=_("All profiles"))
+    extra_context = dict(title=_("All profiles"), type="all")
 
 
 class OrphanedProfileListView(AdminMixin, SingleTableView):
@@ -229,7 +229,7 @@ class OrphanedProfileListView(AdminMixin, SingleTableView):
         .order_by("role", "last_name", "first_name")
     table_class = UserTable
     template_name = "member/profile_list.html"
-    extra_context = dict(title=_("Orphaned profiles"))
+    extra_context = dict(title=_("Orphaned profiles"), type="orphaned")
 
 
 class OrganizersListView(AdminMixin, SingleTableView):
@@ -241,7 +241,7 @@ class OrganizersListView(AdminMixin, SingleTableView):
         .order_by("role", "last_name", "first_name")
     table_class = UserTable
     template_name = "member/profile_list.html"
-    extra_context = dict(title=_("Organizers"))
+    extra_context = dict(title=_("Organizers"), type="organizers")
 
 
 class ResetAdminView(AdminMixin, View):
diff --git a/templates/base.html b/templates/base.html
index 21de1c9..218321b 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -113,14 +113,6 @@
                             {% endif %}
                         {% endif %}
                     {% endif %}
-                    {% if user.admin %}
-                        <li class="nav-item active">
-                            <a class="nav-link" href="{% url "tournament:add" %}"><i class="fas fa-calendar-plus"></i> {% trans "Add a tournament" %}</a>
-                        </li>
-                        <li class="nav-item active">
-                            <a class="nav-link" href="{% url "tournament:add_organizer" %}"><i class="fas fa-user-plus"></i> {% trans "Add an organizer" %}</a>
-                        </li>
-                    {% endif %}
                     {% if user.organizes %}
                         <li class="nav-item active">
                             <a class="nav-link" href="{% url "tournament:all_solutions" %}"><i class="fas fa-lightbulb"></i> {% trans "Solutions" %}</a>
diff --git a/templates/member/my_account.html b/templates/member/my_account.html
index 9031a48..884bf2b 100644
--- a/templates/member/my_account.html
+++ b/templates/member/my_account.html
@@ -4,6 +4,7 @@
 
 {% block content %}
     <form method="post">
+        {% csrf_token %}
         {{ form|crispy }}
         <input type="submit" class="btn btn-primary btn-block" value="{% trans "Submit" %}">
     </form>
diff --git a/templates/member/profile_list.html b/templates/member/profile_list.html
index 1c0d551..cac381f 100644
--- a/templates/member/profile_list.html
+++ b/templates/member/profile_list.html
@@ -4,4 +4,8 @@
 
 {% block content %}
     {% render_table table %}
+    {% if user.admin %}
+        <hr>
+        <a class="btn btn-block btn-secondary" href="{% url "tournament:add_organizer" %}"><i class="fas fa-user-plus"></i> {% trans "Add an organizer" %}</a>
+    {% endif %}
 {% endblock %}
diff --git a/templates/tournament/tournament_list.html b/templates/tournament/tournament_list.html
index 27b9835..cb6ae87 100644
--- a/templates/tournament/tournament_list.html
+++ b/templates/tournament/tournament_list.html
@@ -10,4 +10,8 @@
         </div>
     {% endif %}
     {% render_table table %}
+    {% if type == "organizers" and user.is_authenticated and user.admin %}
+        <hr>
+        <a class="btn btn-block btn-secondary" href="{% url "tournament:add" %}"><i class="fas fa-calendar-plus"></i> {% trans "Add a tournament" %}</a>
+    {% endif %}
 {% endblock %}