diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
index 8d058cb16..c4b4c44b0 100755
--- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php
+++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
@@ -202,7 +202,8 @@ class BaseAdminController extends BaseController
         // Prepare common template variables
         $args = array_merge($args, array(
             'locale'           => $session->getLocale(),
-            'lang'             => $session->getLang(),
+            'lang_code'        => $session->getLang(),
+            'lang_id'          => $session->getLangId(),
             'edition_language' => $edition_language,
             'current_url'      => htmlspecialchars($this->getRequest()->getUri())
         ));
diff --git a/core/lib/Thelia/Core/HttpFoundation/Session/Session.php b/core/lib/Thelia/Core/HttpFoundation/Session/Session.php
index 826bdece7..738cb531d 100755
--- a/core/lib/Thelia/Core/HttpFoundation/Session/Session.php
+++ b/core/lib/Thelia/Core/HttpFoundation/Session/Session.php
@@ -67,6 +67,18 @@ class Session extends BaseSession
         return $this;
     }
 
+    public function getLangId()
+    {
+        return $this->get("lang_id", Lang::getDefaultLanguage()->getId());
+    }
+
+    public function setLangId($langId)
+    {
+        $this->set("lang_id", $langId);
+
+        return $this;
+    }
+
     public function getAdminEditionLangId()
     {
         return $this->get('admin.edition_language', Lang::getDefaultLanguage()->getId());
diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html
index 00f2bb9a7..2cc6b633c 100755
--- a/templates/admin/default/categories.html
+++ b/templates/admin/default/categories.html
@@ -1,4 +1,4 @@
-{check_auth context="admin" roles="ADMIN" permissions="admin.catalog.view" login_tpl="/admin/login"}
+{check_auth roles="ADMIN" permissions="admin.catalog.view" login_tpl="/admin/login"}
 
 {$page_title={intl l='Catalog'}}
 
@@ -31,7 +31,7 @@
 
 							{module_include location='category_list_caption'}
 
-                            {loop type="auth" name="can_create" context="admin" roles="ADMIN" permissions="admin.category.create"}
+                            {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.category.create"}
 	                        <a class="btn btn-primary action-btn" title="{intl l='Add a new category'}" href="#add_category_dialog" data-toggle="modal">
 	                            <i class="icon-plus-sign icon-white"></i>
 	                        </a>
@@ -111,7 +111,7 @@
 	 							{module_include location='category_list_row'}
 
 		                    	<td>
-		                    	    {loop type="auth" name="can_change" context="admin" roles="ADMIN" permissions="admin.category.edit"}
+		                    	    {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.category.edit"}
 		                    		<input type="checkbox" data-id="{$ID}" class="categoryVisibleToggle" {if $VISIBLE == 1}checked="checked"{/if}>
 		                    		{/loop}
 
@@ -121,7 +121,7 @@
 		                    	</td>
 
 		                    	<td>
-		                    	    {loop type="auth" name="can_change" context="admin" roles="ADMIN" permissions="admin.category.edit"}
+		                    	    {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.category.edit"}
 			                        	<a href="{url path='admin/catalog/category' category_id="{$ID}" action='positionUp'}"><i class="icon-arrow-up"></i></a>
 			                            <span class="categoryPositionChange" data-id="{$ID}">{$POSITION}</span>
 			                          	<a href="{url path='admin/catalog/category' category_id="{$ID}" action='positionDown'}"><i class="icon-arrow-down"></i></a>
@@ -135,11 +135,11 @@
 		                        <td>
 	                                <a class="btn btn-mini" title="{intl l='Browse this category'}" href="{url path='admin/catalog/category' id="$ID" action='browse'}"><i class="icon-folder-open"></i></a>
 
-	                                {loop type="auth" name="can_change" context="admin" roles="ADMIN" permissions="admin.category.edit"}
+	                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.category.edit"}
 	                                   <a class="btn btn-mini" title="{intl l='Edit this category'}" href="{url path='admin/catalog/category' id="$ID" action='edit'}"><i class="icon-edit"></i></a>
 	                                {/loop}
 
-	                                {loop type="auth" name="can_delete" context="admin" roles="ADMIN" permissions="admin.category.delete"}
+	                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.category.delete"}
 	                                   <a class="btn btn-mini category-delete" title="{intl l='Delete this category and all its contents'}"  href="#delete_category_dialog" data-id="{$ID}" data-toggle="modal"><i class="icon-trash"></i></a>
 	                                {/loop}
 		                         </td>
@@ -153,7 +153,7 @@
 							<tr>
 								<td class="message">
 								    <div class="alert alert-info">
-								    {loop type="auth" name="can_create" context="admin" roles="ADMIN" permissions="admin.category.create"}
+								    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.category.create"}
 								        {intl l="This category has no sub-categories. To create a new one, click the + button above."}
 								    {/loop}
 
diff --git a/templates/admin/default/configuration.html b/templates/admin/default/configuration.html
index 6973807c7..129f8b004 100644
--- a/templates/admin/default/configuration.html
+++ b/templates/admin/default/configuration.html
@@ -1,4 +1,4 @@
-{check_auth context="admin" roles="ADMIN" permissions="admin.configuration.view" login_tpl="/admin/login"}
+{check_auth roles="ADMIN" permissions="admin.configuration.view" login_tpl="/admin/login"}
 
 {$page_title={intl l='Configuration'}}
 
@@ -21,35 +21,35 @@
 
 	                    {module_include location='catalog_configuration_top'}
 
-                        {loop type="auth" name="pcc1" context="admin" roles="ADMIN" permissions="admin.configuration.product_templates"}
+                        {loop type="auth" name="pcc1" roles="ADMIN" permissions="admin.configuration.product_templates"}
 		                <tr>
 		                    <td><a href="{url path='/admin/configuration/product_templates'}">{intl l='Product templates'}</a></td>
 		                    <td><a class="btn btn-mini" href="{url path='/admin/configuration/product_templates'}"><i class="icon-edit"></i></a></td>
 		                </tr>
 		                {/loop}
 
-                        {loop type="auth" name="pcc2" context="admin" roles="ADMIN" permissions="admin.configuration.product_attributes"}
+                        {loop type="auth" name="pcc2" roles="ADMIN" permissions="admin.configuration.product_attributes"}
 	                    <tr>
 	                        <td><a href="{url path='/admin/configuration/product_attributes'}">{intl l='Product attributes'}</a></td>
 	                        <td><a class="btn btn-mini" href="{url path='/admin/configuration/product_attributes'}"><i class="icon-edit"></i></a></td>
 	                    </tr>
                         {/loop}
 
-                        {loop type="auth" name="pcc3" context="admin" roles="ADMIN" permissions="admin.configuration.product_features"}
+                        {loop type="auth" name="pcc3" roles="ADMIN" permissions="admin.configuration.product_features"}
 	                    <tr>
 	                        <td><a href="{url path='/admin/configuration/product_features'}">{intl l='Product features'}</a></td>
 	                        <td><a class="btn btn-mini" href="{url path='/admin/configuration/product_features'}"><i class="icon-edit"></i></a></td>
 	                    </tr>
                         {/loop}
 
-                        {loop type="auth" name="pcc4" context="admin" roles="ADMIN" permissions="admin.configuration.mailing_template"}
+                        {loop type="auth" name="pcc4" roles="ADMIN" permissions="admin.configuration.mailing_template"}
 	                    <tr>
 	                        <td><a href="{url path='/admin/configuration/mailing_templates'}">{intl l='Mailing templates'}</a></td>
 	                        <td><a class="btn btn-mini" href="{url path='/admin/configuration/mailing_templates'}"><i class="icon-edit"></i></a></td>
 	                    </tr>
                         {/loop}
 
-                        {loop type="auth" name="pcc5" context="admin" roles="ADMIN" permissions="admin.configuration.currencies"}
+                        {loop type="auth" name="pcc5" roles="ADMIN" permissions="admin.configuration.currencies"}
 	                    <tr>
 	                        <td><a href="{url path='/admin/configuration/currencies'}">{intl l='Currencies'}</a></td>
 	                        <td><a class="btn btn-mini" href="{url path='/admin/configuration/currencies'}"><i class="icon-edit"></i></a></td>
@@ -69,21 +69,21 @@
 
 	                    {module_include location='shipping_configuration_top'}
 
-                        {loop type="auth" name="pcc1" context="admin" roles="ADMIN" permissions="admin.configuration.contries"}
+                        {loop type="auth" name="pcc1" roles="ADMIN" permissions="admin.configuration.contries"}
 	                    <tr>
 	                        <td><a href="{url path='/admin/configuration/countries'}">{intl l='Countries'}</a></td>
 	                        <td><a class="btn btn-mini" href="{url path='/admin/configuration/countries'}"><i class="icon-edit"></i></a></td>
 	                    </tr>
                         {/loop}
 
-                        {loop type="auth" name="pcc2" context="admin" roles="ADMIN" permissions="admin.configuration.shipping_zones"}
+                        {loop type="auth" name="pcc2" roles="ADMIN" permissions="admin.configuration.shipping_zones"}
 	                    <tr>
 	                        <td><a href="{url path='/admin/configuration/shipping_zones'}">{intl l='Shipping zones'}</a></td>
 	                        <td><a class="btn btn-mini" href="{url path='/admin/configuration/shipping_zones'}"><i class="icon-edit"></i></a></td>
 	                    </tr>
                         {/loop}
 
-                        {loop type="auth" name="pcc3" context="admin" roles="ADMIN" permissions="admin.configuration.shipping_configuration"}
+                        {loop type="auth" name="pcc3" roles="ADMIN" permissions="admin.configuration.shipping_configuration"}
 	                    <tr>
 	                        <td><a href="{url path='/admin/configuration/shipping_configuration'}">{intl l='Shipping configuration'}</a></td>
 	                        <td><a class="btn btn-mini" href="{url path='/admin/configuration/shipping_configuration'}"><i class="icon-edit"></i></a></td>
@@ -103,56 +103,56 @@
 
 	                    {module_include location='system_configuration_top'}
 
-                        {loop type="auth" name="pcc1" context="admin" roles="ADMIN" permissions="admin.configuration.modules"}
+                        {loop type="auth" name="pcc1" roles="ADMIN" permissions="admin.configuration.modules"}
 	                    <tr>
 	                        <td><a href="{url path='/admin/configuration/modules'}">{intl l='Modules activation'}</a></td>
 	                        <td><a class="btn btn-mini" href="{url path='/admin/configuration/modules'}"><i class="icon-edit"></i></a></td>
 	                    </tr>
                         {/loop}
 
-                        {loop type="auth" name="pcc2" context="admin" roles="ADMIN" permissions="admin.configuration.variables"}
+                        {loop type="auth" name="pcc2" roles="ADMIN" permissions="admin.configuration.variables"}
 	                    <tr>
 	                        <td><a href="{url path='/admin/configuration/variables'}">{intl l='System variables'}</a></td>
 	                        <td><a class="btn btn-mini" href="{url path='/admin/configuration/variables'}"><i class="icon-edit"></i></a></td>
 	                    </tr>
                         {/loop}
 
-                        {loop type="auth" name="pcc3" context="admin" roles="ADMIN" permissions="admin.configuration.admin_profiles"}
+                        {loop type="auth" name="pcc3" roles="ADMIN" permissions="admin.configuration.admin_profiles"}
 	                    <tr>
 	                        <td><a href="{url path='/admin/configuration/admin_profiles'}">{intl l='Back-office profiles'}</a></td>
 	                        <td><a class="btn btn-mini" href="{url path='/admin/configuration/admin_profiles'}"><i class="icon-edit"></i></a></td>
 	                    </tr>
                         {/loop}
 
-                        {loop type="auth" name="pcc4" context="admin" roles="ADMIN" permissions="admin.configuration.admin_users"}
+                        {loop type="auth" name="pcc4" roles="ADMIN" permissions="admin.configuration.admin_users"}
 	                    <tr>
 	                        <td><a href="{url path='/admin/configuration/admin_users'}">{intl l='Back-office users'}</a></td>
 	                        <td><a class="btn btn-mini" href="{url path='/admin/configuration/admin_users'}"><i class="icon-edit"></i></a></td>
 	                    </tr>
                         {/loop}
 
-                        {loop type="auth" name="pcc5" context="admin" roles="ADMIN" permissions="admin.configuration.languages"}
+                        {loop type="auth" name="pcc5" roles="ADMIN" permissions="admin.configuration.languages"}
 	                    <tr>
 	                        <td><a href="{url path='/admin/configuration/languages'}">{intl l='Languages &amp; URLs'}</a></td>
 	                        <td><a class="btn btn-mini" href="{url path='/admin/configuration/languages'}"><i class="icon-edit"></i></a></td>
 	                    </tr>
                         {/loop}
 
-                        {loop type="auth" name="pcc6" context="admin" roles="ADMIN" permissions="admin.configuration.mailing_system"}
+                        {loop type="auth" name="pcc6" roles="ADMIN" permissions="admin.configuration.mailing_system"}
 	                    <tr>
 	                        <td><a href="{url path='/admin/configuration/mailing_system'}">{intl l='Mailing system'}</a></td>
 	                        <td><a class="btn btn-mini" href="{url path='/admin/configuration/mailing_system'}"><i class="icon-edit"></i></a></td>
 	                    </tr>
                         {/loop}
 
-                        {loop type="auth" name="pcc7" context="admin" roles="ADMIN" permissions="admin.configuration.admin_logs"}
+                        {loop type="auth" name="pcc7" roles="ADMIN" permissions="admin.configuration.admin_logs"}
 	                    <tr>
 	                        <td><a href="{url path='/admin/configuration/admin_logs'}">{intl l='Administration logs'}</a></td>
 	                        <td><a class="btn btn-mini" href="{url path='/admin/configuration/admin_logs'}"><i class="icon-edit"></i></a></td>
 	                    </tr>
                         {/loop}
 
-                        {loop type="auth" name="pcc8" context="admin" roles="ADMIN" permissions="admin.configuration.system_logs"}
+                        {loop type="auth" name="pcc8" roles="ADMIN" permissions="admin.configuration.system_logs"}
 	                    <tr>
 	                        <td><a href="{url path='/admin/configuration/system_logs'}">{intl l='System logs'}</a></td>
 	                        <td><a class="btn btn-mini" href="{url path='/admin/configuration/system_logs'}"><i class="icon-edit"></i></a></td>
diff --git a/templates/admin/default/edit_category.html b/templates/admin/default/edit_category.html
index a5a22b71f..d58c251fd 100755
--- a/templates/admin/default/edit_category.html
+++ b/templates/admin/default/edit_category.html
@@ -1,4 +1,4 @@
-{check_auth context="admin" roles="ADMIN" permissions="admin.catalog.view" login_tpl="/admin/login"}
+{check_auth roles="ADMIN" permissions="admin.catalog.view" login_tpl="/admin/login"}
 
 {$page_title={intl l='Edit category'}}
 
diff --git a/templates/admin/default/home.html b/templates/admin/default/home.html
index 6b429ae29..a48e30ec6 100755
--- a/templates/admin/default/home.html
+++ b/templates/admin/default/home.html
@@ -1,4 +1,4 @@
-{check_auth context="admin" roles="ADMIN" login_tpl="/admin/login"}
+{check_auth roles="ADMIN" login_tpl="/admin/login"}
 {$page_title={intl l='Home'}}
 {include file='includes/header.inc.html'}
 
diff --git a/templates/admin/default/includes/header.inc.html b/templates/admin/default/includes/header.inc.html
index f7d99b1ea..2ee435b4b 100755
--- a/templates/admin/default/includes/header.inc.html
+++ b/templates/admin/default/includes/header.inc.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{$lang}">
+<html lang="{$lang_code}">
 <head>
 	<title>{intl l='Thelia Back Office'}{if ! empty($page_title)} - {$page_title}{/if}</title>
 
@@ -43,7 +43,7 @@
 
 {* display top bar once admin is connected *}
 
-{loop name="top-bar-auth" type="auth" context="admin" roles="ADMIN"}
+{loop name="top-bar-auth" type="auth" roles="ADMIN"}
 
 {module_include location='before_topbar'}
 
@@ -58,7 +58,7 @@
   		    <a class="profile" href="{url path='admin/edit_profile'}">{admin attr="firstname"} {admin attr="lastname"}</a>
   		    <a class="logout" href="{url path='admin/logout'}" title="{intl l='Close administation session'}">{intl l="Logout"}</a></div>
 
-  		{loop name="top-bar-search" type="auth" context="admin" roles="ADMIN" permissions="admin.search"}
+  		{loop name="top-bar-search" type="auth" roles="ADMIN" permissions="admin.search"}
 	    <form class="form-search pull-right" action="{url path='/admin/search'}">
 	         <div class="control-group">
 	             <div class="input-append">
@@ -89,13 +89,13 @@
             			<a href="{url path='/admin/home'}">{intl l="Home"}</a>
             		</li>
 
-            		{loop name="menu-auth-customer" type="auth" context="admin" roles="ADMIN" permissions="admin.customers.view"}
+            		{loop name="menu-auth-customer" type="auth" roles="ADMIN" permissions="admin.customers.view"}
             		<li class="{if $admin_current_location == 'customer'}active{/if}" id="customers_menu">
             			<a href="{url path='/admin/customers'}">{intl l="Customers"}</a>
             		</li>
             		{/loop}
 
-            		{loop name="menu-auth-order" type="auth" context="admin" roles="ADMIN" permissions="admin.orders.view"}
+            		{loop name="menu-auth-order" type="auth" roles="ADMIN" permissions="admin.orders.view"}
             		<li class="dropdown {if $admin_current_location == 'customer'}active{/if}" id="orders_menu" data-toggle="dropdown">
 
             			<a href="#">{intl l="Orders"} <span class="caret"></span></a>
@@ -118,31 +118,31 @@
             		</li>
             		{/loop}
 
-            		{loop name="menu-auth-catalog" type="auth" context="admin" roles="ADMIN" permissions="admin.catalog.view"}
+            		{loop name="menu-auth-catalog" type="auth" roles="ADMIN" permissions="admin.catalog.view"}
             		<li class="{if $admin_current_location == 'catalog'}active{/if}" id="catalog_menu">
             			<a href="{url path='/admin/catalog'}">{intl l="Catalog"}</a>
             		</li>
 					{/loop}
 
-            		{loop name="menu-auth-content" type="auth" context="admin" roles="ADMIN" permissions="admin.content.view"}
+            		{loop name="menu-auth-content" type="auth" roles="ADMIN" permissions="admin.content.view"}
             		<li class="{if $admin_current_location == 'content'}active{/if}" id="content_menu">
             			<a href="{url path='/admin/content'}">{intl l="Content"}</a>
             		</li>
 					{/loop}
 
-            		{loop name="menu-auth-discount" type="auth" context="admin" roles="ADMIN" permissions="admin.discount.view"}
+            		{loop name="menu-auth-discount" type="auth" roles="ADMIN" permissions="admin.discount.view"}
             		<li class="{if $admin_current_location == 'discount'}active{/if}" id="discount_menu">
             			<a href="{url path='/admin/discount'}">{intl l="Discount"}</a>
             		</li>
 					{/loop}
 
-            		{loop name="menu-auth-config" type="auth" context="admin" roles="ADMIN" permissions="admin.config.view"}
+            		{loop name="menu-auth-config" type="auth" roles="ADMIN" permissions="admin.config.view"}
             		<li class="{if $admin_current_location == 'configuration'}active{/if}" id="config_menu">
             			<a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a>
             		</li>
 					{/loop}
 
-            		{loop name="menu-auth-modules" type="auth" context="admin" roles="ADMIN" permissions="admin.modules.view"}
+            		{loop name="menu-auth-modules" type="auth" roles="ADMIN" permissions="admin.modules.view"}
             		<li class="{if $admin_current_location == 'modules'}active{/if}" id="modules_menu">
             			<a href="{url path='/admin/modules'}">{intl l="Modules"}</a>
             		</li>
diff --git a/templates/admin/default/variable-edit.html b/templates/admin/default/variable-edit.html
index 410838df8..86d13060a 100644
--- a/templates/admin/default/variable-edit.html
+++ b/templates/admin/default/variable-edit.html
@@ -1,4 +1,4 @@
-{check_auth context="admin" roles="ADMIN" permissions="admin.configuration.variables.edit" login_tpl="/admin/login"}
+{check_auth roles="ADMIN" permissions="admin.configuration.variables.edit" login_tpl="/admin/login"}
 
 {$page_title={intl l='Edit a system variable'}}
 
diff --git a/templates/admin/default/variables.html b/templates/admin/default/variables.html
index 2c290b625..f47ec53dd 100644
--- a/templates/admin/default/variables.html
+++ b/templates/admin/default/variables.html
@@ -1,4 +1,4 @@
-{check_auth context="admin" roles="ADMIN" permissions="admin.configuration.variables.view" login_tpl="/admin/login"}
+{check_auth roles="ADMIN" permissions="admin.configuration.variables.view" login_tpl="/admin/login"}
 
 {$page_title={intl l='Thelia System Variables'}}
 
@@ -11,13 +11,11 @@
         <ul class="breadcrumb">
             <li><a href="{url path='/admin/home'}">{intl l="Home"}</a> <span class="divider">/</span></li>
             <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a> <span class="divider">/</span></li>
-            <li>{intl l="System variables"}</li>
+            <li><a href="{url path='/admin/configuration/variables'}">{intl l="System variables"}</a></li>
         </ul>
 
         {module_include location='variables_top'}
 
-        <h2>{intl l="Thelia system variables configuration"}</h2>
-
         <div class="row-fluid">
 
             <div class="span12">
@@ -26,7 +24,7 @@
 	                    <table class="table table-striped table-condensed table-left-aligned">
 	                        <caption>
 	                           {intl l='Thelia system variables'}
-	                           {loop type="auth" name="can_create" context="admin" roles="ADMIN" permissions="admin.configuration.variables.create"}
+	                           {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.variables.create"}
                                 <a class="btn btn-primary action-btn" title="{intl l='Add a new variable'}" href="#add_variable_dialog" data-toggle="modal">
                                     <i class="icon-plus-sign icon-white"></i>
                                 </a>
@@ -43,10 +41,25 @@
 
                                <th>&nbsp;</th>
 	                        </tr>
-	                        {loop name="config" type="config" hidden="0" secured="*" backend_context="1"}
+
+	                        {loop name="config" type="config" hidden="0" secured="*" backend_context="1" lang="$lang_id"}
 	                            <tr>
-	                                <td>{$TITLE}</td>
-	                                <td>{$NAME}</td>
+
+	                               <td>{$TITLE}</td>
+
+                                   <td>
+                                   {if ! $SECURED}
+                                       {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.variables.change"}
+                                           <a title="{intl l='Change this variable'}" href="{url path='/admin/configuration/variables/change' variable_id="$ID"}">{$NAME}</a>
+                                       {/loop}
+                                       {elseloop rel="can_change"}
+                                           {$NAME}
+                                       {/elseloop}
+                                   {else}
+                                       {$NAME}
+                                   {/if}
+                                   </td>
+
 	                                <td>
 	                                    {if $SECURED}
 	                                        {$VALUE}
@@ -62,14 +75,16 @@
 		                                    <div class="btn-group">
                                                <a class="btn btn-mini cancel-edit" id="cancel_edit_btn_{$ID}" data-id="{$ID}" title="{intl l='Cancel changes and revert to original value'}" href="#"><i class="icon-remove"></i></a>
 
-                                               {loop type="auth" name="can_change" context="admin" roles="ADMIN" permissions="admin.configuration.variables.change"}
+                                               {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.variables.change"}
                                                    <a class="btn btn-mini config-change" title="{intl l='Change this variable'}" href="{url path='/admin/configuration/variables/change' variable_id="$ID"}"><i class="icon-edit"></i></a>
                                                {/loop}
 
-                                               {loop type="auth" name="can_delete" context="admin" roles="ADMIN" permissions="admin.configuration.variables.delete"}
+                                               {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.variables.delete"}
                                                    <a class="btn btn-mini config-delete" title="{intl l='Delete this variable'}" href="#delete_variable_dialog" data-id="{$ID}" data-toggle="modal"><i class="icon-trash"></i></a>
                                                {/loop}
 		                                    </div>
+		                                {else}
+		                                    <i title="{intl l='This variable could not be changed.'}" class="icon icon-ban-circle"></i>
 	                                    {/if}
 	                                </td>
 	                            </tr>