diff --git a/application/logintwig.class.inc.php b/application/logintwig.class.inc.php
index ed0c88787..b800e2e80 100644
--- a/application/logintwig.class.inc.php
+++ b/application/logintwig.class.inc.php
@@ -8,7 +8,7 @@
 
 
 use Combodo\iTop\Application\Branding;
-use Combodo\iTop\TwigExtension;
+use Combodo\iTop\Application\TwigBase\Twig\Extension;
 
 /**
  * Twig context for modules extending the login screen
@@ -234,7 +234,7 @@ class LoginTwigRenderer
 
 		$oLoader = new Twig_Loader_Chain($aTwigLoaders);
 		$this->oTwig = new Twig_Environment($oLoader);
-		TwigExtension::RegisterTwigExtensions($this->oTwig);
+		Extension::RegisterTwigExtensions($this->oTwig);
 	}
 
 	public function GetDefaultVars()
diff --git a/application/twigextension.class.inc.php b/application/twigextension.class.inc.php
index 8a8cec26f..d0a92aab4 100644
--- a/application/twigextension.class.inc.php
+++ b/application/twigextension.class.inc.php
@@ -4,6 +4,7 @@ namespace Combodo\iTop;
 
 use AttributeDate;
 use AttributeDateTime;
+use DeprecatedCallsLog;
 use Dict;
 use Exception;
 use MetaModel;
@@ -12,6 +13,8 @@ use Twig_SimpleFilter;
 use Twig_SimpleFunction;
 use utils;
 
+DeprecatedCallsLog::NotifyDeprecatedFile('instead use sources/Application/TwigBase/Twig/Extension.php, which is loaded by the autoloader');
+
 /**
  * Class TwigExtension
  *