diff --git a/datamodels/2.x/itop-portal-base/portal/config/bootstrap.php b/datamodels/2.x/itop-portal-base/portal/config/bootstrap.php
index 1c0b6bc893..896c2a0a14 100644
--- a/datamodels/2.x/itop-portal-base/portal/config/bootstrap.php
+++ b/datamodels/2.x/itop-portal-base/portal/config/bootstrap.php
@@ -147,10 +147,6 @@ if (empty($_ENV['PORTAL_ID']))
 	exit;
 }
 
-// Stacking context tag so it knows we are in the portal
-$oContext = new ContextTag('GUI:Portal');
-$oContext2 = new ContextTag('Portal:' . $_ENV['PORTAL_ID']);
-
 // Env. vars to be used in templates and others
 $_ENV['COMBODO_CURRENT_ENVIRONMENT'] = utils::GetCurrentEnvironment();
 $_ENV['COMBODO_ABSOLUTE_URL'] = utils::GetAbsoluteUrlAppRoot();
diff --git a/datamodels/2.x/itop-portal-base/portal/public/index.php b/datamodels/2.x/itop-portal-base/portal/public/index.php
index ad2c169042..e03b7b56a0 100644
--- a/datamodels/2.x/itop-portal-base/portal/public/index.php
+++ b/datamodels/2.x/itop-portal-base/portal/public/index.php
@@ -15,8 +15,6 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- *
- *
  */
 
 use Combodo\iTop\Portal\Kernel;
@@ -24,6 +22,10 @@ use Symfony\Component\HttpFoundation\Request;
 
 require_once MODULESROOT.'itop-portal-base/portal/config/bootstrap.php';
 
+// Stacking context tag so it knows we are in the portal
+$oContext = new ContextTag('GUI:Portal');
+$oContext2 = new ContextTag('Portal:' . $_ENV['PORTAL_ID']);
+
 // Note: Manually refactored ternary condition to be PHP 5.x compatible
 if ($trustedProxies = isset($_SERVER['TRUSTED_PROXIES']) ? $_SERVER['TRUSTED_PROXIES'] : (isset($_ENV['TRUSTED_PROXIES']) ? $_ENV['TRUSTED_PROXIES'] : false))
 {