diff --git a/backend/src/utils/templateSafeObjects.ts b/backend/src/utils/templateSafeObjects.ts
index 9ca5a498..0c96b0b1 100644
--- a/backend/src/utils/templateSafeObjects.ts
+++ b/backend/src/utils/templateSafeObjects.ts
@@ -244,28 +244,28 @@ export function guildToTemplateSafeGuild(guild: Guild): TemplateSafeGuild {
 }
 
 export function userToTemplateSafeUser(user: User | UnknownUser | PartialUser): TemplateSafeUser {
-  if (user instanceof UnknownUser || user.partial) {
+  if (user instanceof User) {
     return new TemplateSafeUser({
       id: user.id,
-      username: "Unknown",
-      discriminator: "0000",
+      username: user.username,
+      discriminator: user.discriminator,
+      globalName: user.globalName,
       mention: `<@${user.id}>`,
-      tag: "Unknown#0000",
-      renderedUsername: "Unknown",
+      tag: user.tag,
+      avatarURL: user.displayAvatarURL?.() || "",
+      bot: user.bot,
+      createdAt: user.createdTimestamp,
+      renderedUsername: renderUsername(user),
     });
   }
 
   return new TemplateSafeUser({
     id: user.id,
-    username: user.username,
-    discriminator: user.discriminator,
-    globalName: user.globalName,
+    username: "Unknown",
+    discriminator: "0000",
     mention: `<@${user.id}>`,
-    tag: user.tag,
-    avatarURL: user.displayAvatarURL(),
-    bot: user.bot,
-    createdAt: user.createdTimestamp,
-    renderedUsername: renderUsername(user),
+    tag: "Unknown#0000",
+    renderedUsername: "Unknown",
   });
 }