diff --git a/phpBB/bin/phpbbcli.php b/phpBB/bin/phpbbcli.php
index c847b884e0..18657aed0a 100755
--- a/phpBB/bin/phpbbcli.php
+++ b/phpBB/bin/phpbbcli.php
@@ -68,7 +68,8 @@ require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
 $user = $phpbb_container->get('user');
 $user->add_lang('acp/common');
 $user->add_lang('cli');
+$lang = $phpbb_container->get('language');
 
-$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION, $user);
+$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION, $lang);
 $application->register_container_commands($phpbb_container->get('console.command_collection'));
 $application->run($input);
diff --git a/phpBB/phpbb/console/application.php b/phpBB/phpbb/console/application.php
index 0943e8a4b8..2c69a3cc73 100644
--- a/phpBB/phpbb/console/application.php
+++ b/phpBB/phpbb/console/application.php
@@ -26,18 +26,18 @@ class application extends \Symfony\Component\Console\Application
 	protected $in_shell = false;
 
 	/**
-	* @var \phpbb\user User object
+	* @var \phpbb\language\language User object
 	*/
-	protected $user;
+	protected $language;
 
 	/**
-	* @param string			$name		The name of the application
-	* @param string			$version	The version of the application
-	* @param \phpbb\user	$user		The user which runs the application (used for translation)
+	* @param string						$name		The name of the application
+	* @param string						$version	The version of the application
+	* @param \phpbb\language\language	$language	The user which runs the application (used for translation)
 	*/
-	public function __construct($name, $version, $user)
+	public function __construct($name, $version, \phpbb\language\language $language)
 	{
-		$this->user = $user;
+		$this->language = $language;
 
 		parent::__construct($name, $version);
 	}
@@ -53,7 +53,7 @@ class application extends \Symfony\Component\Console\Application
 			'safe-mode',
 			null,
 			InputOption::VALUE_NONE,
-			$this->user->lang('CLI_DESCRIPTION_OPTION_SAFE_MODE')
+			$this->language->lang('CLI_DESCRIPTION_OPTION_SAFE_MODE')
 		));
 
 		return $input_definition;
@@ -80,7 +80,7 @@ class application extends \Symfony\Component\Console\Application
 			'--shell',
 			'-s',
 			InputOption::VALUE_NONE,
-			$this->user->lang('CLI_DESCRIPTION_OPTION_SHELL')
+			$this->language->lang('CLI_DESCRIPTION_OPTION_SHELL')
 		));
 
 		return parent::getHelp();