diff --git a/application/Espo/Core/Rebuild/Actions/AddSystemUser.php b/application/Espo/Core/Rebuild/Actions/AddSystemUser.php
index e9f8cf6ab6..26d354acc5 100644
--- a/application/Espo/Core/Rebuild/Actions/AddSystemUser.php
+++ b/application/Espo/Core/Rebuild/Actions/AddSystemUser.php
@@ -34,6 +34,7 @@ use Espo\Core\Utils\Config;
 use Espo\Core\Utils\SystemUser;
 use Espo\Entities\User;
 use Espo\ORM\EntityManager;
+use Espo\ORM\Name\Attribute;
 
 class AddSystemUser implements RebuildAction
 {
@@ -73,10 +74,12 @@ class AddSystemUser implements RebuildAction
 
         $user = $repository->getNew();
 
-        $user->set('id', $this->systemUser->getId());
-        $user->set('userName', SystemUser::NAME);
-        $user->set('type', User::TYPE_SYSTEM);
-        $user->set($attributes);
+        $user
+            ->set(Attribute::ID, $this->systemUser->getId())
+            ->setUserName(SystemUser::NAME)
+            ->setType(User::TYPE_SYSTEM);
+
+        $user->setMultiple($attributes);
 
         $repository->save($user);
     }
diff --git a/application/Espo/Entities/User.php b/application/Espo/Entities/User.php
index 7fe32015a3..29baece343 100644
--- a/application/Espo/Entities/User.php
+++ b/application/Espo/Entities/User.php
@@ -79,6 +79,19 @@ class User extends Person
         return $this->get('type');
     }
 
+    /**
+     * @param self::TYPE_* $type
+     */
+    public function setType(string $type): self
+    {
+        return $this->set('type', $type);
+    }
+
+    public function setUserName(?string $userName): self
+    {
+        return $this->set('userName', $userName);
+    }
+
     /**
      * Is regular user.
      */