diff --git a/src/functional_tests/test_bill_my_buds.py b/src/functional_tests/test_bill_my_buds.py
index 759c202..ac7f06a 100644
--- a/src/functional_tests/test_bill_my_buds.py
+++ b/src/functional_tests/test_bill_my_buds.py
@@ -25,7 +25,9 @@ class MyBudsPageTest(FunctionalTest):
         entry = self.wait_for(
             lambda: self.browser.find_element(By.CSS_SELECTOR, ".bud-entry .bud-name")
         )
-        self.assertEqual(entry.text, "alice")
+        # Bud names render via `at_handle` filter — `@<username>` w. an
+        # `@` prefix on users w. a username; truncated email otherwise.
+        self.assertEqual(entry.text, "@alice")
 
     def test_empty_state_when_no_buds(self):
         self.browser.get(self.live_server_url + "/billboard/my-buds/")
@@ -44,12 +46,12 @@ class MyBudsPageTest(FunctionalTest):
         ok = self.browser.find_element(By.CSS_SELECTOR, "#id_bud_panel .btn.btn-confirm")
         ok.click()
 
-        # New entry appears w. alice's username (not the bare email)
+        # New entry appears w. alice's @-prefixed handle (not the bare email)
         self.wait_for(lambda: self.assertEqual(
             self.browser.find_element(
                 By.CSS_SELECTOR, f".bud-entry[data-bud-id='{self.alice.id}'] .bud-name"
             ).text,
-            "alice",
+            "@alice",
         ))
         # Server-side persisted
         self.wait_for(lambda: self.assertIn(
diff --git a/src/templates/apps/billboard/_partials/_applet-most-recent-scroll.html b/src/templates/apps/billboard/_partials/_applet-most-recent-scroll.html
index de596cc..193a0b4 100644
--- a/src/templates/apps/billboard/_partials/_applet-most-recent-scroll.html
+++ b/src/templates/apps/billboard/_partials/_applet-most-recent-scroll.html
@@ -11,7 +11,7 @@
             {% for event in recent_events %}
                 <div class="drama-event {% if event.actor == viewer %}mine{% elif event.actor %}theirs{% else %}system{% endif %}">
                     <span class="drama-event-body{% if event.struck %} struck{% endif %}">
-                        {% if event.actor %}<strong>{{ event.actor|display_name }}</strong>{% endif %}
+                        {% if event.actor %}<strong>{{ event.actor|at_handle }}</strong>{% endif %}
                         {{ event.to_prose|safe }}
                     </span>
                     <time class="drama-event-time" datetime="{{ event.timestamp|date:'c' }}">
diff --git a/src/templates/apps/billboard/_partials/_bud_add_panel.html b/src/templates/apps/billboard/_partials/_bud_add_panel.html
index 2abbd68..93d673e 100644
--- a/src/templates/apps/billboard/_partials/_bud_add_panel.html
+++ b/src/templates/apps/billboard/_partials/_bud_add_panel.html
@@ -46,7 +46,12 @@
         li.dataset.budId = bud.id;
         var name = document.createElement('span');
         name.className = 'bud-name';
-        name.textContent = bud.username;
+        // Mirror the `at_handle` template filter: prefix `@` on plain
+        // usernames; leave the value untouched if it already contains
+        // `@` (the server falls back to email when username is unset,
+        // and emails don't take the prefix).
+        var display = bud.username || '';
+        name.textContent = display.indexOf('@') >= 0 ? display : '@' + display;
         li.appendChild(name);
         var buffer = list.querySelector('.bud-entry-buffer');
         if (buffer) list.insertBefore(li, buffer);
diff --git a/src/templates/apps/billboard/_partials/_bud_panel.html b/src/templates/apps/billboard/_partials/_bud_panel.html
index 4086d93..d615745 100644
--- a/src/templates/apps/billboard/_partials/_bud_panel.html
+++ b/src/templates/apps/billboard/_partials/_bud_panel.html
@@ -16,7 +16,7 @@
 </button>
 
 <div id="id_bud_panel"
-     data-sharer-name="{% if request.user.is_authenticated %}{{ request.user|display_name }}{% endif %}">
+     data-sharer-name="{% if request.user.is_authenticated %}{{ request.user|at_handle }}{% endif %}">
     <input id="id_recipient"
            name="recipient"
            type="text"
diff --git a/src/templates/apps/billboard/_partials/_my_buds_item.html b/src/templates/apps/billboard/_partials/_my_buds_item.html
index d6cdaca..25080a4 100644
--- a/src/templates/apps/billboard/_partials/_my_buds_item.html
+++ b/src/templates/apps/billboard/_partials/_my_buds_item.html
@@ -1,4 +1,4 @@
 {% load lyric_extras %}
 <li class="applet-list-entry bud-entry" data-bud-id="{{ item.id }}">
-    <span class="bud-name">{{ item|display_name }}</span>
+    <span class="bud-name">{{ item|at_handle }}</span>
 </li>
diff --git a/src/templates/apps/billboard/_partials/_my_scrolls_item.html b/src/templates/apps/billboard/_partials/_my_scrolls_item.html
index 5ed5ae5..6a93054 100644
--- a/src/templates/apps/billboard/_partials/_my_scrolls_item.html
+++ b/src/templates/apps/billboard/_partials/_my_scrolls_item.html
@@ -8,7 +8,7 @@
 <li class="applet-list-entry row-3col">
     <a href="{% url 'billboard:scroll' item.id %}" class="row-title">{{ item.name|truncate_title }}</a>
     {% if item.latest_event %}
-        <span class="row-body">{% if item.latest_event.actor %}{{ item.latest_event.actor|display_name }} {% endif %}{{ item.latest_event.to_prose|striptags }}</span>
+        <span class="row-body">{% if item.latest_event.actor %}{{ item.latest_event.actor|at_handle }} {% endif %}{{ item.latest_event.to_prose|striptags }}</span>
         <time class="row-ts" datetime="{{ item.latest_event.timestamp|date:'c' }}">{{ item.latest_event.timestamp|relative_ts }}</time>
     {% endif %}
 </li>
diff --git a/src/templates/apps/gameboard/_partials/_my_games_item.html b/src/templates/apps/gameboard/_partials/_my_games_item.html
index 62d2f7d..6ec5fd0 100644
--- a/src/templates/apps/gameboard/_partials/_my_games_item.html
+++ b/src/templates/apps/gameboard/_partials/_my_games_item.html
@@ -7,7 +7,7 @@
 <li class="applet-list-entry row-3col">
     <a href="{% url 'epic:gatekeeper' item.id %}" class="row-title">{{ item.name|truncate_title }}</a>
     {% if item.latest_event %}
-        <span class="row-body">{% if item.latest_event.actor %}{{ item.latest_event.actor|display_name }} {% endif %}{{ item.latest_event.to_prose|striptags }}</span>
+        <span class="row-body">{% if item.latest_event.actor %}{{ item.latest_event.actor|at_handle }} {% endif %}{{ item.latest_event.to_prose|striptags }}</span>
         <time class="row-ts" datetime="{{ item.latest_event.timestamp|date:'c' }}">{{ item.latest_event.timestamp|relative_ts }}</time>
     {% endif %}
 </li>
diff --git a/src/templates/core/_partials/_navbar.html b/src/templates/core/_partials/_navbar.html
index 6d9956e..cc2d74c 100644
--- a/src/templates/core/_partials/_navbar.html
+++ b/src/templates/core/_partials/_navbar.html
@@ -11,7 +11,7 @@
                         Logged in as
                     </span>
                     <span class="navbar-identity">
-                        @{{ user|display_name }}
+                        {{ user|at_handle }}
                     </span>
                 </div>
                 <form method="POST" action="{% url "logout" %}">
diff --git a/src/templates/core/_partials/_scroll.html b/src/templates/core/_partials/_scroll.html
index 3e258b6..b73cd3f 100644
--- a/src/templates/core/_partials/_scroll.html
+++ b/src/templates/core/_partials/_scroll.html
@@ -3,7 +3,7 @@
     {% for event in events %}
         <div class="drama-event {% if event.actor == viewer %}mine{% elif event.actor %}theirs{% else %}system{% endif %}" data-label="{% if event.struck %}redact{% else %}frame{% endif %}">
             <span class="drama-event-body{% if event.struck %} struck{% endif %}">
-                {% if event.actor %}<strong>{{ event.actor|display_name }}</strong>{% endif %}
+                {% if event.actor %}<strong>{{ event.actor|at_handle }}</strong>{% endif %}
                 {{ event.to_prose|safe }}
             </span>
             <time class="drama-event-time" datetime="{{ event.timestamp|date:'c' }}">