diff --git a/include/common.inc.php b/include/common.inc.php
index 8aeafb7bf..005297d25 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -208,19 +208,6 @@ include(
.'/themeconf.inc.php'
);
-if (is_adviser())
-{
- ob_start();// buffer output so that cookies work
- echo '
-
-
-
'.$lang['adviser_mode_enabled'].'
-
-
-
- ';
-}
-
// template instance
$template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template']);
?>
diff --git a/include/page_header.php b/include/page_header.php
index b793c6a58..cd4e59316 100644
--- a/include/page_header.php
+++ b/include/page_header.php
@@ -52,6 +52,16 @@ $template->assign_vars(
'TAG_INPUT_ENABLED' => ((is_adviser()) ? 'disabled' : '')
));
+if (is_adviser())
+{
+ $template->assign_vars(
+ array(
+ 'ADVISER_ENABLED' => $lang['adviser_mode_enabled']
+ )
+ );
+}
+
+
// refresh
if ( isset( $refresh ) and intval($refresh) >= 0 and isset( $url_link ) and isset( $redirect_msg ) )
{
diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl
index d432d7b63..43d63cd6a 100644
--- a/template/yoga/header.tpl
+++ b/template/yoga/header.tpl
@@ -29,5 +29,8 @@ the "text/nonsense" prevents gecko based browsers to load it -->