diff --git a/src/data/DefaultLogMessages.json b/src/data/DefaultLogMessages.json
index 310e3cc6..73b6d7c8 100644
--- a/src/data/DefaultLogMessages.json
+++ b/src/data/DefaultLogMessages.json
@@ -27,8 +27,8 @@
   "ROLE_DELETE": "🖊 Role **{role.name}** (`{role.id}`) was deleted",
   "ROLE_EDIT": "🖊 Role **{role.name}** (`{role.id}`) was edited",
 
-  "MESSAGE_EDIT": "✏ {userMention(member)} edited their message in {channelMention(channel)}:\n\n**Before:**{messageSummary(before)}\n**After:**{messageSummary(after)}",
-  "MESSAGE_DELETE": "🗑 Message from {userMention(member)} deleted in {channelMention(channel)} (originally posted at **{messageDate}**):{messageSummary(message)}",
+  "MESSAGE_EDIT": "✏ {userMention(user)} edited their message in {channelMention(channel)}:\n\n**Before:**{messageSummary(before)}\n**After:**{messageSummary(after)}",
+  "MESSAGE_DELETE": "🗑 Message from {userMention(user)} deleted in {channelMention(channel)} (originally posted at **{messageDate}**):{messageSummary(message)}",
   "MESSAGE_DELETE_BULK": "🗑 **{count}** messages deleted in {channelMention(channel)} ({archiveUrl})",
   "MESSAGE_DELETE_BARE": "🗑 Message (`{messageId}`) deleted in {channelMention(channel)} (no more info available)",
 
@@ -41,7 +41,7 @@
 
   "MESSAGE_SPAM_DETECTED": "🛑 {userMention(member)} spam detected in {channelMention(channel)}: {description} (more than {limit} in {interval}s)\n{archiveUrl}",
   "OTHER_SPAM_DETECTED": "🛑 {userMention(member)} spam detected: {description} (more than {limit} in {interval}s)",
-  "CENSOR": "🛑 Censored message from {userMention(member)} in {channelMention(channel)}: {reason}:\n```{messageText}```",
+  "CENSOR": "🛑 Censored message from {userMention(user)} in {channelMention(channel)}: {reason}:\n```{messageText}```",
   "CLEAN": "🚿 {userMention(mod)} cleaned **{count}** message(s) in {channelMention(channel)}\n{archiveUrl}",
 
   "CASE_CREATE": "✏ {userMention(mod)} manually created new **{caseType}** case (#{caseNum})",
diff --git a/src/plugins/Censor.ts b/src/plugins/Censor.ts
index 368cbb9e..ca839f4b 100644
--- a/src/plugins/Censor.ts
+++ b/src/plugins/Censor.ts
@@ -102,11 +102,11 @@ export class CensorPlugin extends ZeppelinPlugin<ICensorPluginConfig> {
       return;
     }
 
-    const member = this.guild.members.get(savedMessage.user_id);
+    const user = await this.resolveUser(savedMessage.user_id);
     const channel = this.guild.channels.get(savedMessage.channel_id);
 
     this.serverLogs.log(LogType.CENSOR, {
-      member: stripObjectToScalars(member, ["user"]),
+      user: stripObjectToScalars(user),
       channel: stripObjectToScalars(channel),
       reason,
       messageText: disableCodeBlocks(deactivateMentions(savedMessage.data.content)),
diff --git a/src/plugins/Logs.ts b/src/plugins/Logs.ts
index 2de3c8f1..15c8093a 100644
--- a/src/plugins/Logs.ts
+++ b/src/plugins/Logs.ts
@@ -430,7 +430,7 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
   }
 
   // Uses events from savesMessages
-  onMessageUpdate(savedMessage: SavedMessage, oldSavedMessage: SavedMessage) {
+  async onMessageUpdate(savedMessage: SavedMessage, oldSavedMessage: SavedMessage) {
     // To log a message update, either the message content or a rich embed has to change
     let logUpdate = false;
     const oldRichEmbed = (oldSavedMessage.data.embeds || []).find(e => (e as Embed).type === "rich");
@@ -449,11 +449,11 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
       return;
     }
 
-    const member = this.guild.members.get(savedMessage.user_id);
+    const user = await this.resolveUser(savedMessage.user_id);
     const channel = this.guild.channels.get(savedMessage.channel_id);
 
     this.guildLogs.log(LogType.MESSAGE_EDIT, {
-      member: stripObjectToScalars(member, ["user"]),
+      user: stripObjectToScalars(user),
       channel: stripObjectToScalars(channel),
       before: oldSavedMessage,
       after: savedMessage,
@@ -461,11 +461,11 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
   }
 
   // Uses events from savesMessages
-  onMessageDelete(savedMessage: SavedMessage) {
-    const member = this.guild.members.get(savedMessage.user_id);
+  async onMessageDelete(savedMessage: SavedMessage) {
+    const user = await this.resolveUser(savedMessage.user_id);
     const channel = this.guild.channels.get(savedMessage.channel_id);
 
-    if (member) {
+    if (user) {
       // Replace attachment URLs with media URLs
       if (savedMessage.data.attachments) {
         for (const attachment of savedMessage.data.attachments as Attachment[]) {
@@ -476,7 +476,7 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
       this.guildLogs.log(
         LogType.MESSAGE_DELETE,
         {
-          member: stripObjectToScalars(member, ["user"]),
+          user: stripObjectToScalars(user),
           channel: stripObjectToScalars(channel),
           messageDate: moment(savedMessage.data.timestamp, "x").format(this.getConfig().format.timestamp),
           message: savedMessage,