diff --git a/templates/zephyr/activity.html b/templates/zephyr/activity.html
index 7ba75fa84a..6e421d08c8 100644
--- a/templates/zephyr/activity.html
+++ b/templates/zephyr/activity.html
@@ -43,7 +43,7 @@
     {% for email, row in activity.sorted_rows %}
         <tr class="{{ row.class }}">
         <td><strong>{{ row.full_name }}</strong></td>
-        <td><strong>{{ row.short_name }}</strong></td>
+        <td><strong>{{ row.username }}</strong></td>
         <td><strong>{{ row.realm }}</strong></td>
         <td sorttable_customkey="{{ row.get_updates_last|date:'YmdHi' }}">{{ row.get_updates_last }}</td>
         <td sorttable_customkey="{{ row.send_message_last|date:'YmdHi' }}">{{ row.send_message_last }}</td>
diff --git a/zephyr/views.py b/zephyr/views.py
index f9fe96ebc8..5a0eedda6f 100644
--- a/zephyr/views.py
+++ b/zephyr/views.py
@@ -1160,7 +1160,7 @@ class ActivityTable(object):
                 row = self.rows.setdefault(record.user_profile.user.email, {})
                 row['realm'] = record.user_profile.realm.domain
                 row['full_name'] = record.user_profile.full_name
-                row['short_name'] = record.user_profile.short_name
+                row['username'] = record.user_profile.user.email.split('@')[0]
                 row[query_name + '_count'] = record.count
                 row[query_name + '_last' ] = record.last_visit