diff --git a/src/data/logbook.ts b/src/data/logbook.ts
index be4ab3166e..cdb5a8197b 100644
--- a/src/data/logbook.ts
+++ b/src/data/logbook.ts
@@ -4,4 +4,5 @@ export interface LogbookEntry {
   message: string;
   entity_id?: string;
   domain: string;
+  context_user_id?: string;
 }
diff --git a/src/panels/logbook/ha-logbook.ts b/src/panels/logbook/ha-logbook.ts
index ded1e6a288..507319fb2e 100644
--- a/src/panels/logbook/ha-logbook.ts
+++ b/src/panels/logbook/ha-logbook.ts
@@ -9,6 +9,7 @@ import {
 } from "lit-element";
 import { scroll } from "lit-virtualizer";
 import { formatDate } from "../../common/datetime/format_date";
+import { fetchUsers } from "../../data/user";
 import { formatTimeWithSeconds } from "../../common/datetime/format_time";
 import { fireEvent } from "../../common/dom/fire_event";
 import { domainIcon } from "../../common/entity/domain_icon";
@@ -21,6 +22,9 @@ import { HomeAssistant } from "../../types";
 class HaLogbook extends LitElement {
   @property() public hass!: HomeAssistant;
 
+  @property({ attribute: false })
+  private _userid_to_name = {};
+
   @property() public entries: LogbookEntry[] = [];
 
   @property({ attribute: "rtl", type: Boolean, reflect: true })
@@ -58,6 +62,20 @@ class HaLogbook extends LitElement {
     `;
   }
 
+  private async _fetchUsers() {
+    const users = await fetchUsers(this.hass);
+    const userid_to_name = {};
+    users.forEach((user) => {
+      userid_to_name[user.id] = user.name;
+    });
+    this._userid_to_name = userid_to_name;
+  }
+
+  protected firstUpdated(changedProperties: PropertyValues) {
+    super.firstUpdated(changedProperties);
+    this._fetchUsers();
+  }
+
   private _renderLogbookItem(
     item: LogbookEntry,
     index?: number
@@ -67,6 +85,8 @@ class HaLogbook extends LitElement {
     }
     const previous = this.entries[index - 1];
     const state = item.entity_id ? this.hass.states[item.entity_id] : undefined;
+    const item_username =
+      item.context_user_id && this._userid_to_name[item.context_user_id];
     return html`
       <div>
         ${index === 0 ||
@@ -101,7 +121,11 @@ class HaLogbook extends LitElement {
                     ${item.name}
                   </a>
                 `}
-            <span>${item.message}</span>
+            <span
+              >${item.message}${item_username
+                ? ` (${item_username})`
+                : ``}</span
+            >
           </div>
         </div>
       </div>