diff --git a/l4d2web/l4d2web/templates/_live_state.html b/l4d2web/l4d2web/templates/_live_state.html
index 6695226..1b115b8 100644
--- a/l4d2web/l4d2web/templates/_live_state.html
+++ b/l4d2web/l4d2web/templates/_live_state.html
@@ -18,6 +18,7 @@
 {% if current_players %}
   <ul class="player-grid current">
     {% for session, profile in current_players %}
+      {% set display_name = (profile and profile.persona_name) or session.name_at_join %}
       <li class="player-card current-card">
         <a class="player-link"
            href="https://steamcommunity.com/profiles/{{ session.steam_id_64 }}"
@@ -27,7 +28,7 @@
           {% else %}
             <span class="avatar placeholder" aria-hidden="true"></span>
           {% endif %}
-          <span class="name" title="{{ (profile and profile.persona_name) or session.name_at_join }}">{{ (profile and profile.persona_name) or session.name_at_join }}</span>
+          <span class="name" title="{{ display_name }}">{{ display_name }}</span>
         </a>
         <span class="meta">
           {{ session.joined_at | timeago }} · {{ session.min_ping }}-{{ session.max_ping }}ms
@@ -50,6 +51,7 @@
   </h3>
   <ul class="player-grid recent">
     {% for row in recent_players_overview %}
+      {% set display_name = row.persona_name or row.name_at_join %}
       <li class="player-card recent-chip">
         <a class="player-link"
            href="https://steamcommunity.com/profiles/{{ row.steam_id_64 }}"
@@ -59,7 +61,7 @@
           {% else %}
             <span class="avatar placeholder" aria-hidden="true"></span>
           {% endif %}
-          <span class="name" title="{{ row.persona_name or row.name_at_join }}">{{ row.persona_name or row.name_at_join }}</span>
+          <span class="name" title="{{ display_name }}">{{ display_name }}</span>
         </a>
         <span class="meta">· {{ row.last_seen | timeago }}</span>
       </li>