diff --git a/src/shared/components/search.tsx b/src/shared/components/search.tsx
index 0dd47487..6796ad35 100644
--- a/src/shared/components/search.tsx
+++ b/src/shared/components/search.tsx
@@ -383,7 +383,7 @@ export class Search extends Component<any, SearchState> {
   userListing(user: UserView) {
     return [
       <span>
-        <UserListing user={user} />
+        <UserListing user={user} showApubName />
       </span>,
       <span>{` - ${i18n.t('number_of_comments', {
         count: user.number_of_comments,
diff --git a/src/shared/components/user-listing.tsx b/src/shared/components/user-listing.tsx
index 43fa16e2..a8e4025f 100644
--- a/src/shared/components/user-listing.tsx
+++ b/src/shared/components/user-listing.tsx
@@ -21,6 +21,7 @@ interface UserListingProps {
   useApubName?: boolean;
   muted?: boolean;
   hideAvatar?: boolean;
+  showApubName?: boolean;
 }
 
 export class UserListing extends Component<UserListingProps, any> {
@@ -47,6 +48,10 @@ export class UserListing extends Component<UserListingProps, any> {
       ? user.preferred_username
       : apubName;
 
+    if (this.props.showApubName && !local && user.preferred_username) {
+      displayName = `${displayName} (${apubName})`;
+    }
+
     return (
       <>
         <Link