diff --git a/application/Espo/EntryPoints/Avatar.php b/application/Espo/EntryPoints/Avatar.php
index de058ce2f0..7e339af6d1 100644
--- a/application/Espo/EntryPoints/Avatar.php
+++ b/application/Espo/EntryPoints/Avatar.php
@@ -157,8 +157,9 @@ class Avatar extends Image
         $color = $this->getColor($user);
         $textColor = $this->isDark($color) ? $textColors[0] : $textColors[1];
 
-        $avatar = (new InitialAvatar())
-            ->name($user->getName() ?? $user->getUserName() ?? $userId);
+        $name = $this->getName($user, $userId);
+
+        $avatar = (new InitialAvatar())->name($name);
 
         if ($user->getName() && !self::isAllowedLanguage($avatar)) {
             $avatar = $avatar->name($user->getUserName() ?? $userId);
@@ -287,4 +288,15 @@ class Avatar extends Image
 
         return [$light, $dark];
     }
+
+    private function getName(User $user, string $userId): string
+    {
+        $name = $user->getName() ?? $user->getUserName() ?? $userId;
+
+        if ($user->getUserName() === SystemUser::NAME) {
+            $name = SystemUser::NAME;
+        }
+
+        return $name;
+    }
 }