diff --git a/public/main/admin/user_edit.php b/public/main/admin/user_edit.php
index 82abfe0d11..30f996f85d 100644
--- a/public/main/admin/user_edit.php
+++ b/public/main/admin/user_edit.php
@@ -439,11 +439,11 @@ if ($form->validate()) {
             $status = COURSEMANAGER;
         }
 
-        if ('true' == api_get_setting('login_is_email')) {
+        if ('true' === api_get_setting('login_is_email')) {
             $username = $email;
         }
 
-        $template = isset($user['email_template_option']) ? $user['email_template_option'] : [];
+        $template = $user['email_template_option'] ?? [];
 
         UserManager::update_user(
             $user_id,
diff --git a/public/main/admin/user_list.php b/public/main/admin/user_list.php
index 2af8b0a9f6..1c6ce931c4 100644
--- a/public/main/admin/user_list.php
+++ b/public/main/admin/user_list.php
@@ -41,10 +41,6 @@ if (isset($_GET['user_id']) && 'login_as' === $action) {
             Display::addFlash(Display::return_message($goTo, 'normal', false));
 
             api_location($url.'?_switch_user='.$oldUserInfo['username']);
-            /*Display::display_header(get_lang('User list'));
-            echo Display::return_message($message, 'normal', false);
-            echo Display::return_message($goTo, 'normal', false);
-            Display::display_footer();*/
             exit;
         } else {
             api_not_allowed(true);
diff --git a/public/main/install/index.php b/public/main/install/index.php
index a5dd928a29..1c8cc3704d 100644
--- a/public/main/install/index.php
+++ b/public/main/install/index.php
@@ -620,7 +620,7 @@ if (isset($_POST['step2'])) {
         $container = $kernel->getContainer();
 
         Container::setContainer($container);
-        Container::setLegacyServices($container, false);
+        Container::setLegacyServices($container);
 
         $manager = $container->get('doctrine')->getManager();
 
diff --git a/public/main/install/install.lib.php b/public/main/install/install.lib.php
index f5920b07ec..b351fe8b21 100644
--- a/public/main/install/install.lib.php
+++ b/public/main/install/install.lib.php
@@ -2081,7 +2081,7 @@ function installSchemas($container, $upgrade = false)
 function upgradeWithContainer($container)
 {
     Container::setContainer($container);
-    Container::setLegacyServices($container, false);
+    Container::setLegacyServices($container);
     error_log('setLegacyServices');
     $manager = Database::getManager();
 
@@ -2135,7 +2135,7 @@ function finishInstallationWithContainer(
 ) {
     error_log('finishInstallationWithContainer');
     Container::setContainer($container);
-    Container::setLegacyServices($container, false);
+    Container::setLegacyServices($container);
     error_log('setLegacyServices');
 
     //UserManager::setPasswordEncryption($encryptPassForm);