diff --git a/phpBB/config/default/container/services_twig.yml b/phpBB/config/default/container/services_twig.yml
index 5d7bf0eff3..6b54311f41 100644
--- a/phpBB/config/default/container/services_twig.yml
+++ b/phpBB/config/default/container/services_twig.yml
@@ -33,7 +33,7 @@ services:
         class: phpbb\template\twig\extension
         arguments:
             - @template_context
-            - @user
+            - @language
         tags:
             - { name: twig.extension }
 
diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php
index 14d1258c09..92f87a0331 100644
--- a/phpBB/phpbb/template/twig/extension.php
+++ b/phpBB/phpbb/template/twig/extension.php
@@ -18,20 +18,20 @@ class extension extends \Twig_Extension
 	/** @var \phpbb\template\context */
 	protected $context;
 
-	/** @var \phpbb\user */
-	protected $user;
+	/** @var \phpbb\language\language */
+	protected $language;
 
 	/**
 	* Constructor
 	*
 	* @param \phpbb\template\context $context
-	* @param \phpbb\user $user
+	* @param \phpbb\language\language $language
 	* @return \phpbb\template\twig\extension
 	*/
-	public function __construct(\phpbb\template\context $context, $user)
+	public function __construct(\phpbb\template\context $context, $language)
 	{
 		$this->context = $context;
-		$this->user = $user;
+		$this->language = $language;
 	}
 
 	/**
@@ -181,6 +181,6 @@ class extension extends \Twig_Extension
 		// LA_ is transformed into lang(\'$1\')|escape('js'), so we should not
 		// need to check for it
 
-		return call_user_func_array(array($this->user, 'lang'), $args);
+		return call_user_func_array(array($this->language, 'lang'), $args);
 	}
 }