diff --git a/rhodecode/templates/admin/auth/auth_settings.mako b/rhodecode/templates/admin/auth/auth_settings.mako
--- a/rhodecode/templates/admin/auth/auth_settings.mako
+++ b/rhodecode/templates/admin/auth/auth_settings.mako
@@ -31,7 +31,7 @@
     <div class="sidebar">
         <ul class="nav nav-pills nav-stacked">
           % for item in resource.get_root().get_nav_list():
-            <li ${'class=active' if item == resource else ''}>
+            <li ${('class=active' if item == resource else '')}>
               <a href="${request.resource_path(item, route_name='auth_home')}">${item.display_name}</a>
             </li>
           % endfor
@@ -67,10 +67,10 @@
                   <th>${_('Plugin ID')}</th>
                   <th>${_('Enabled')}</th>
                   %for plugin in available_plugins:
-                      <tr class="${'inactive' if (not plugin.is_active() and plugin.get_id() in enabled_plugins) else ''}">
+                      <tr class="${('inactive' if (not plugin.is_active() and plugin.get_id() in enabled_plugins) else '')}">
                           <td>
-                            <span plugin_id="${plugin.get_id()}" class="toggle-plugin btn ${'btn-success' if plugin.get_id() in enabled_plugins else ''}">
-                              ${_('activated') if plugin.get_id() in enabled_plugins else _('not active')}
+                            <span plugin_id="${plugin.get_id()}" class="toggle-plugin btn ${('btn-success' if plugin.get_id() in enabled_plugins else '')}">
+                              ${(_('activated') if plugin.get_id() in enabled_plugins else _('not active'))}
                             </span>
                           </td>
                           <td>${plugin.get_display_name()}</td>
diff --git a/rhodecode/templates/admin/auth/plugin_settings.mako b/rhodecode/templates/admin/auth/plugin_settings.mako
--- a/rhodecode/templates/admin/auth/plugin_settings.mako
+++ b/rhodecode/templates/admin/auth/plugin_settings.mako
@@ -2,10 +2,10 @@
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
-  ${_('Authentication Settings')}
-  %if c.rhodecode_name:
+    ${_('Authentication Settings')}
+    %if c.rhodecode_name:
     &middot; ${h.branding(c.rhodecode_name)}}
-  %endif
+    %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
@@ -17,22 +17,23 @@
 </%def>
 
 <%def name="menu_bar_nav()">
-  ${self.menu_items(active='admin')}
+    ${self.menu_items(active='admin')}
+</%def>
+
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='authentication')}
 </%def>
 
 <%def name="main()">
+
   <div class="box">
-    <div class="title">
-      ${self.breadcrumbs()}
-    </div>
+
     <div class='sidebar-col-wrapper'>
 
-      ## TODO: This is repeated in the auth root template and should be merged
-      ##       into a single solution.
       <div class="sidebar">
         <ul class="nav nav-pills nav-stacked">
           % for item in resource.get_root().get_nav_list():
-            <li ${'class=active' if item == resource else ''}>
+            <li ${('class=active' if item == resource else '')}>
               <a href="${request.resource_path(item, route_name='auth_home')}">${item.display_name}</a>
             </li>
           % endfor