diff --git a/phpBB/includes/di/extension/core.php b/phpBB/includes/di/extension/core.php
index d0a3ebdf99..4e1159e6fd 100644
--- a/phpBB/includes/di/extension/core.php
+++ b/phpBB/includes/di/extension/core.php
@@ -51,7 +51,8 @@ class phpbb_di_extension_core extends Extension
 	*/
 	public function load(array $config, ContainerBuilder $container)
 	{
-		if (file_exists($this->root_path . 'install/update/new/config/services.yml'))
+		// If we are in install, try to use the updated version, when available
+		if (defined('IN_INSTALL') && file_exists($this->root_path . 'install/update/new/config/services.yml'))
 		{
 			$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->root_path . 'install/update/new/config')));
 			$loader->load('services.yml');
diff --git a/phpBB/includes/user.php b/phpBB/includes/user.php
index f823e85148..f8ff3b8b13 100644
--- a/phpBB/includes/user.php
+++ b/phpBB/includes/user.php
@@ -590,14 +590,15 @@ class phpbb_user extends phpbb_session
 				$language_filename = $lang_path . $this->lang_name . '/' . $filename . '.' . $phpEx;
 			}
 
-			if (!file_exists($language_filename))
+			if (defined('IN_INSTALL'))
 			{
-				// File was not found, try to find it in update directory
+				// If we are in install, try to use the updated version, when available
 				$orig_language_filename = $language_filename;
 				$language_filename = str_replace('language/', 'install/update/new/language/', $language_filename);
+
 				if (!file_exists($language_filename))
 				{
-					// Not found either, go back to the original file name
+					// Not found, go back to the original file name
 					$language_filename = $orig_language_filename;
 				}
 			}