diff --git a/core/lib/Thelia/Core/Template/ParserContext.php b/core/lib/Thelia/Core/Template/ParserContext.php
index 8d1d50fdc..e5d635fda 100644
--- a/core/lib/Thelia/Core/Template/ParserContext.php
+++ b/core/lib/Thelia/Core/Template/ParserContext.php
@@ -40,9 +40,9 @@ class ParserContext implements \IteratorAggregate
 
 		// Setup basic variables
 		$this
-			->set('base_url'		, ConfigQuery::read('base_url', '/'))
-			->set('index_page'		, URL::getIndexPage())
-			->set('return_to_url'	, URL::absoluteUrl($request->getSession()->getReturnToUrl()))
+			->set('BASE_URL'		, ConfigQuery::read('base_url', '/'))
+			->set('INDEX_PAGE'		, URL::getIndexPage())
+			->set('RETURN_TO_URL'	, URL::absoluteUrl($request->getSession()->getReturnToUrl()))
 		;
 	}
 
diff --git a/templates/default/connexion.html b/templates/default/connexion.html
index e5d8641cf..e8a88e655 100755
--- a/templates/default/connexion.html
+++ b/templates/default/connexion.html
@@ -1,8 +1,8 @@
 {include file="includes/header.html"}
 
 {form name="thelia.customer.creation"}
-{* We use $index_page as form action to avoid mixing post and get data *}
-<form action="{$index_page}" method="post" {form_enctype form=$form}>
+{* We use $INDEX_PAGE as form action to avoid mixing post and get data *}
+<form action="{$INDEX_PAGE}" method="post" {form_enctype form=$form}>
 	{*
 	The two fields below are not par of the Login form, they are here to defines
 	the action to process, and the view to render once the form is submited
@@ -17,7 +17,7 @@
 	*}
 
 	{form_field form=$form field='success_url'}
-	<input type="hidden" name="{$name}" value="{$return_to_url}" /> {* the url the user is redirected to on login success *}
+	<input type="hidden" name="{$name}" value="{$RETURN_TO_URL}" /> {* the url the user is redirected to on login success *}
 	{/form_field}
 
 	{*
diff --git a/templates/default/login.html b/templates/default/login.html
index 4e17a86aa..7f79a3b53 100644
--- a/templates/default/login.html
+++ b/templates/default/login.html
@@ -3,8 +3,8 @@
 <h1>{intl l='Please login'}</h1>
 
 {form name="thelia.customer.login" }
-{* We use $index_page as form action to avoid mixing post and get data *}
-<form action="{$index_page}" method="post" {form_enctype form=$form}>
+{* We use $INDEX_PAGE as form action to avoid mixing post and get data *}
+<form action="{$INDEX_PAGE}" method="post" {form_enctype form=$form}>
 
 	{*
 	The two fields below are not par of the Login form, they are here to defines
@@ -20,7 +20,7 @@
 	*}
 
 	{form_field form=$form field='success_url'}
-	<input type="hidden" name="{$name}" value="{$return_to_url}" /> {* the url the user is redirected to on login success *}
+	<input type="hidden" name="{$name}" value="{$RETURN_TO_URL}" /> {* the url the user is redirected to on login success *}
 	{/form_field}
 
 	{*