diff --git a/extension.php b/extension.php
index 2ba444a4b6..dc967fe139 100644
--- a/extension.php
+++ b/extension.php
@@ -47,13 +47,11 @@ if (!isset($pathInfo['extension']) || $pathInfo['extension'] !== 'zip' || !is_fi
 }
 
 $app = new \Espo\Core\Application();
+$app->setupSystemUser();
 
 $config = $app->getContainer()->get('config');
 $entityManager = $app->getContainer()->get('entityManager');
 
-$user = $entityManager->getEntity('User', 'system');
-$app->getContainer()->setUser($user);
-
 $upgradeManager = new \Espo\Core\ExtensionManager($app->getContainer());
 
 echo "Starting installation process...\n";
diff --git a/upgrade.php b/upgrade.php
index 4f44ce9407..4ac07f3f02 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -52,13 +52,11 @@ if (!isset($pathInfo['extension']) || $pathInfo['extension'] !== 'zip' || !is_fi
 }
 
 $app = new \Espo\Core\Application();
+$app->setupSystemUser();
 
 $config = $app->getContainer()->get('config');
 $entityManager = $app->getContainer()->get('entityManager');
 
-$user = $entityManager->getEntity('User', 'system');
-$app->getContainer()->setUser($user);
-
 $upgradeManager = new \Espo\Core\UpgradeManager($app->getContainer());
 
 echo "Current version is " . $config->get('version') . "\n";