diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html
index b09ff8fa..d3b79982 100644
--- a/seminar/templates/seminar/cojemam/organizatori.html
+++ b/seminar/templates/seminar/cojemam/organizatori.html
@@ -9,14 +9,10 @@
 
 {% block content %}
 <div>
+  {% if not aktivni %}
+    <a href="/co-je-MaM/organizatori/">Aktivní organizátoři</a>
+  {% endif %}
   {% for org in object_list %}
-    <!--
-    {% if org.user.is_active %}
-      <b>Aktivní</b>
-    {% else %}
-      Není aktivní
-    {% endif %}
-    -->
     <h2>
     {{org.user.first_name}}
     {% if org.prezdivka %}
@@ -53,6 +49,8 @@
 
   {% if aktivni%}
     <a href="organizovali/">Vysloužilí organizátoři</a>
+  {% else %}
+    <a href="/co-je-MaM/organizatori/">Aktivní organizátoři</a>
   {% endif %}
 
 </div>
diff --git a/seminar/views.py b/seminar/views.py
index 6263bb34..8ca58936 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -65,7 +65,7 @@ class CojemamOrganizatoriView(generic.ListView):
 class CojemamOrganizatoriStariView(generic.ListView):
     model = Organizator
     template_name='seminar/cojemam/organizatori.html'
-    queryset = Organizator.objects.filter(organizuje_do_roku__isnull=False, organizuje_do_roku__lt=date.today().year).order_by('user__first_name')
+    queryset = Organizator.objects.filter(organizuje_do_roku__isnull=False, organizuje_do_roku__lt=date.today().year).order_by('-organizuje_do_roku')
 
 ### Archiv