diff --git a/fp-interface/sharedtpls/login_success.tpl b/fp-interface/sharedtpls/login_success.tpl
index ddd40f3..0fbfd88 100755
--- a/fp-interface/sharedtpls/login_success.tpl
+++ b/fp-interface/sharedtpls/login_success.tpl
@@ -1,6 +1,6 @@
-{if $smarty.request.do.logout}
+{if isset($smarty.request.do) && $smarty.request.do.logout}
 <p>{$lang.login.success.logout}</p>
-{if $smarty.request.redirect}
+{if isset($smarty.request.redirect)}
 <p>{$lang.login.success.redirect} <a href="{$smarty.request.redirect}">{$smarty.request.redirect}</a>
 {/if}
 
@@ -9,7 +9,7 @@
 </ul>
 {else}
 <p>{$lang.login.success.success}</p>
-{if $redirect}
+{if isset($redirect)}
 <p>{$lang.login.success.redirect}
 {/if}
 
diff --git a/fp-interface/themes/leggero/cpheader.tpl b/fp-interface/themes/leggero/cpheader.tpl
index 83ea68e..01d74b1 100644
--- a/fp-interface/themes/leggero/cpheader.tpl
+++ b/fp-interface/themes/leggero/cpheader.tpl
@@ -7,6 +7,8 @@
 	{action hook=admin_head}
 </head>
 
+{if !isset($panel)} {assign var=panel value=""} {/if}
+{if !isset($action)} {assign var=action value=""} {/if}
 <body class="{"admin-$panel-$action"|tag:admin_body_class}">
 	<div id="body-container">
 	<div id="outer-container">
