diff --git a/config/routing.yml b/config/routing.yml
index f41362624f..679280f301 100644
--- a/config/routing.yml
+++ b/config/routing.yml
@@ -1,9 +1,11 @@
-admin_login_check:
-    pattern:   /admin/login_check
+secured_login_check:
+    pattern:   /secured/login_check
 
-admin_logout:
-    pattern:   /admin/logout
+secured_logout:
+    pattern:   /secured/logout
 
+logout:
+    pattern:   /secured/logout
 home:
     path:      /home
     defaults:  { _controller: index.controller:indexAction, culture: en }
diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index c06670eca0..91d17ca6ae 100644
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -5904,7 +5904,7 @@ class Exercise
                 break;
             case '2':
                 global $app;
-                $url = $app['url_generator']->generate('admin_logout');
+                $url = $app['url_generator']->generate('logout');
                 $html = Display::url(get_lang('Logout'), $url, array('class' => 'btn btn-large'));
                 break;
         }
diff --git a/main/template/default/auth/login.tpl b/main/template/default/auth/login.tpl
index 4f430e01be..c7e79c4341 100644
--- a/main/template/default/auth/login.tpl
+++ b/main/template/default/auth/login.tpl
@@ -22,7 +22,7 @@
         </script>
     {% endif %}
 
-    <form class="form-signin" action="{{ url('admin_login_check') }}" method="post">
+    <form class="form-signin" action="{{ url('secured_login_check') }}" method="post">
         <h2 class="form-signin-heading">{{ 'SignIn' | get_lang }}</h2>
         {% if error %}
             <div class="alert">
diff --git a/main/template/default/layout/menu.tpl b/main/template/default/layout/menu.tpl
index 9ce4000690..3e10c1e4d5 100644
--- a/main/template/default/layout/menu.tpl
+++ b/main/template/default/layout/menu.tpl
@@ -48,7 +48,7 @@
                         </li>
                     {% endif %}
                     <li>
-                        <a id="logout_button" class="logout" title="{{ "Logout"|get_lang }}" href="{{ url('admin_logout') }}" >
+                        <a id="logout_button" class="logout" title="{{ "Logout"|get_lang }}" href="{{ url('logout') }}" >
                             <img src="{{ "exit.png"|icon(22) }}">
                         </a>
                     </li>
diff --git a/main/template/default/layout/page_body.tpl b/main/template/default/layout/page_body.tpl
index 9d84bb0e48..5c4b09a4e8 100644
--- a/main/template/default/layout/page_body.tpl
+++ b/main/template/default/layout/page_body.tpl
@@ -1,4 +1,4 @@
-{#  Actions  #}
+{# Actions  #}
 {% if actions != '' %}
     <div class="actions">
         {{ actions }}
@@ -9,21 +9,21 @@
     {{ knp_menu_render('actions_menu', { 'currentClass': 'active'}) }}
 {% endif %}
 
-{#  Page header #}
+{# Page header #}
 {% if header != '' %}
     <div class="page-header">
         <h1>{{ header }}</h1>
     </div>
 {% endif %}
 
-
-{% if is_granted('ROLE_PREVIOUS_ADMIN') %}
+{# Check if security exists #}
+{% if app.security.token and is_granted('ROLE_PREVIOUS_ADMIN') %}
     <div class="alert">
         <a href="{{ path('index', {'_switch_user': '_exit'}) }}">{{ 'Exit impersonation' | trans }}</a>
     </div>
 {% endif %}
 
-{#  Show messages #}
+{# Show messages #}
 {% if message != '' %}
     <section id="messages">
         {{ message}}
@@ -32,7 +32,7 @@
 
 {% include app.template_style ~ "/layout/messages.tpl" %}
 
-{#  Welcome to course block  #}
+{# Welcome to course block  #}
 {% if welcome_to_course_block %}
     <section id="welcome_to_course">
         {% include app.template_style ~ "/layout/welcome_to_course.tpl" %}
diff --git a/src/ChamiloLMS/Controller/IndexController.php b/src/ChamiloLMS/Controller/IndexController.php
index 460cdfa52e..54b314a6c1 100644
--- a/src/ChamiloLMS/Controller/IndexController.php
+++ b/src/ChamiloLMS/Controller/IndexController.php
@@ -236,7 +236,7 @@ class IndexController extends CommonController
           ->getForm();
           return $app['template']->assign('form', $form->createView());
          */
-        $form = new \FormValidator('formLogin', 'POST', $app['url_generator']->generate('admin_login_check'), null, array('class' => 'form-vertical'));
+        $form = new \FormValidator('formLogin', 'POST', $app['url_generator']->generate('secured_login_check'), null, array('class' => 'form-vertical'));
         $form->addElement(
             'text',
             'username',