diff --git a/doc/source/_exts/candidates.py b/doc/source/_exts/candidates.py
index 2a355da8..d5d88c02 100644
--- a/doc/source/_exts/candidates.py
+++ b/doc/source/_exts/candidates.py
@@ -62,6 +62,8 @@ def build_archive(serie, list_type):
                 db['tags']['TC-APPOINTED'] = True
             elif candidate['elected'] == 'INCUMBENT-PTL':
                 db['tags']['INCUMBENT-PTL'] = True
+            elif candidate['elected'] == 'LEADERLESS':
+                db['tags']['LEADERLESS'] = True
     output = os.path.join(".", "doc", "source",
                           "results", serie, "%s.rst" % list_type)
     template_name = "%s_archive.jinja" % list_type
diff --git a/doc/source/_exts/ptl_announce.jinja b/doc/source/_exts/ptl_announce.jinja
index 22c3548e..6666a2bb 100644
--- a/doc/source/_exts/ptl_announce.jinja
+++ b/doc/source/_exts/ptl_announce.jinja
@@ -6,7 +6,7 @@ Thank you to the electorate, to all those who voted and to all candidates who pu
 Now for the results of the PTL election process, please join me in extending congratulations to the following PTLs:
 
 {% for project in projects %}
- * {{ project.replace('_', ' ').ljust(25) }} : {% for candidate in candidates[project] %}{% if candidate['elected'] %}{{ candidate['fullname'].ljust(44) }}{% endif %}{% endfor %}
+ * {{ project.replace('_', ' ').ljust(25) }} : {% for candidate in candidates[project] %}{% if candidate['elected'] and 'url' in candidate %}{{ candidate['fullname'].ljust(44) }}{% endif %}{% endfor %}
 
 {% endfor %}
 
diff --git a/doc/source/_exts/ptl_archive.jinja b/doc/source/_exts/ptl_archive.jinja
index b00b25e7..1451481d 100644
--- a/doc/source/_exts/ptl_archive.jinja
+++ b/doc/source/_exts/ptl_archive.jinja
@@ -9,6 +9,8 @@
 
 {% for candidate in candidates[project] %}{% if candidate['elected'] and 'url' in candidate %}
   * `{{ candidate['fullname'] }} ({{ candidate['ircname'] }}) <{{ candidate['url'] }}>`__
+{% elif candidate['elected'] == 'LEADERLESS' %}
+  * {{ candidate['statement'] }}
 {% elif candidate['elected'] %}
   * {{ candidate['fullname'] }} (\{{ candidate['ircname'] }}) {% if candidate['elected'] == 'INCUMBENT-PTL' %}[#IncumbentPTL]_{% else %}[#TCAppointed]_{% endif %}