diff --git a/templates/logbook2005style.html b/templates/logbook2005style.html
index fb64a1e86..9900aed53 100644
--- a/templates/logbook2005style.html
+++ b/templates/logbook2005style.html
@@ -22,7 +22,7 @@ See troggle/code/views/other.py and core.models/logbooks.py writelogbook(year, f
 <hr />
 
 <div class="tripdate" id="{{logbook_entry.slug}}">{{logbook_entry.date|date:'Y-m-d'}}</div>
-<div class="trippeople">{% for personlogentry in logbook_entry.personlogentry_set.all %}{% if  personlogentry.is_logbook_entry_author %}<u>{{personlogentry.personexpedition.person|safe}}</u>{% else %}{{ personlogentry.personexpedition.person|safe }}{% endif %}, {% endfor %}{% if logbook_entry.other_people %}, {{logbook_entry.other_people}}{% endif %}</div>
+<div class="trippeople">{% for personlogentry in logbook_entry.personlogentry_set.all %}{% if  personlogentry.is_logbook_entry_author %}<u>{% if personlogentry.nickname_used %}{{personlogentry.nickname_used|safe}}{% else %}{{personlogentry.personexpedition.person|safe}}{% endif %}</u>{% else %}{% if personlogentry.nickname_used %}{{personlogentry.nickname_used|safe}}{% else %}{{personlogentry.personexpedition.person|safe}}{% endif %}{% endif %}, {% endfor %}{% if logbook_entry.other_people %}, {{logbook_entry.other_people}}{% endif %}</div>
 <div class="triptitle">{{logbook_entry.title|safe}}</div>
 {{logbook_entry.text|safe}}
 <div class="timeug">T/U: {{logbook_entry.time_underground|safe}} hours</div>