diff --git a/admin/admin.tpl b/admin/admin.tpl
index 4083225..44ea5c0 100644
--- a/admin/admin.tpl
+++ b/admin/admin.tpl
@@ -12,8 +12,11 @@
 	<script src="{$smarty.const.BLOG_BASEURL}/admin/res/admin.js" ></script>
 	<link rel="stylesheet" href="{$smarty.const.BLOG_BASEURL}/admin/res/sceditor/themes/default.min.css" />
 </head>
-
+{if isset($action)}
 <body class="{"admin-$panel-$action"|tag:admin_body_class}">
+{else}
+<body class="{"admin-$panel"|tag:admin_body_class}">
+{/if}
 	<nav class="navbar navbar-dark flex-md-nowrap top-nav top-color">
 	<div class="container-fluid">
 		<div class="row master-row top-row mobile_menu_hide">
@@ -58,19 +61,19 @@
 				<div class="sidebar-sticky">
 					<ul class="nav flex-column">
 						{foreach from=$menubar item=tab}
-						{if $tab eq $panel}
+						{if isset($tab) && isset($panel) && $tab eq $panel}
 						
 						<li id="admin-{$tab}" class="nav-item">
 							<a id="admin-link-{$tab}" class="admin-tab-current nav-link active" href="{$smarty.const.BLOG_BASEURL}admin.php?p={$tab}">
 								{$lang.admin.panels[$tab]|default:$tab}
 							</a>
 						</li>
-						{if $submenu}
+						{if isset($submenu)}
 						<ul class="nav flex-column submenu">
 							{foreach from=$submenu key=subtab item=item}
-							{if $item}
+							{if isset($item)}
 							<li id="admin-{$panel}-{$subtab}" class="nav-item">
-								<a class="nav-link{if $action == $subtab} sub-active{/if}"
+								<a class="nav-link{if isset($action) && isset($subtab) && $action == $subtab} sub-active{/if}"
 									href="{$smarty.const.BLOG_BASEURL}admin.php?p={$panel}&amp;action={$subtab}">
 									<span class="ti-arrow-circle-right"></span>
 								{$lang.admin[$panel].submenu[$subtab]|default:$subtab}
diff --git a/admin/panels/entry/admin.entry.list.tpl b/admin/panels/entry/admin.entry.list.tpl
index 8bde07a..2b3048a 100644
--- a/admin/panels/entry/admin.entry.list.tpl
+++ b/admin/panels/entry/admin.entry.list.tpl
@@ -19,7 +19,7 @@
 						<tr>
 						<td>{$id|entry_idtotime|date_format:"`$fp_config.locale.dateformatshort`, `$fp_config.locale.timeformat`"}</td>
 						<td class="main-cell">
-						{if in_array('draft',$categories)}
+						{if isset($categories) && in_array('draft',$categories)}
 						(<em class="entry-flag">{$lang.entry.flags.short.draft}</em>)
 						{/if}
 						<a class="link-general" 
@@ -62,7 +62,7 @@
 					</br>
 					{/entry_block}
 				  	<div class="entry_filter">
-						<form method="get" action="{$smarty.request.PHP_SELF}?p=entry">
+					<form method="get" action="{if isset($smarty.request.PHP_SELF)}{$smarty.request.PHP_SELF}{/if}?p=entry">
 						<p> <input type="hidden" name="p" value="entry" /> </p>
 							<select name="category" class="alignleft form-control select_filter">
 							<option label="Unfiltered" value="all">{$panelstrings.nofilter}</option>
diff --git a/admin/panels/main/admin.main.tpl b/admin/panels/main/admin.main.tpl
index 72e9845..6267164 100755
--- a/admin/panels/main/admin.main.tpl
+++ b/admin/panels/main/admin.main.tpl
@@ -42,7 +42,7 @@
 				<h6 class="m-0 font-weight-bold text-primary">{$panelstrings.last_comments}</h6>
 			</div>
 			<div class="card-body lc_table">
-				{if $last_comments_table}
+				{if isset($last_comments_table)}
 					{$last_comments_table}
 				{else}
 					<h2 class="text-center font-italic">No comments yet :(</h2>
diff --git a/fp-interface/sharedtpls/admin_errorlist.tpl b/fp-interface/sharedtpls/admin_errorlist.tpl
index 13fea65..a81338b 100644
--- a/fp-interface/sharedtpls/admin_errorlist.tpl
+++ b/fp-interface/sharedtpls/admin_errorlist.tpl
@@ -1,9 +1,9 @@
 <div id="errorlist">
-		{if $error}
+		{if isset($error)}
 		<ul class="msgs errors">
 			{foreach from=$error key=field item=msg}
 			<li class="alert alert-danger" role="alert">
-			{if is_numeric($field)}
+			{if isset($field) && is_numeric($field)}
 				{$msg} 
 			{else}
 				<a href="#{$field}" class="alert-link">{$msg}</a>
@@ -13,11 +13,11 @@
 		</ul>
 		{/if}
 		
-		{if $warnings}
+		{if isset($warnings)}
 		<ul class="msgs warnings">
 			{foreach from=$warnings key=field item=msg}
 			<li class="alert alert-warning" role="alert">
-			{if is_numeric($field)}
+			{if isset($field) && is_numeric($field)}
 				{$msg} 
 			{else}
 				<a href="#{$field}" class="alert-link">{$msg}</a>
@@ -27,7 +27,7 @@
 		</ul>
 		{/if}
 		
-		{if $notifications}
+		{if isset($notifications)}
 		<ul class="msgs notifications alert alert-info">
 			{foreach from=$notifications item=msg}
 			<li>{$msg}</li>
@@ -36,7 +36,7 @@
 		{/if}
 
 		
-		{if $success}
+		{if isset($success)}
 		{if $success < 0}
 			{assign var=class value="alert alert-danger"}
 		{else}
diff --git a/fp-interface/sharedtpls/login.tpl b/fp-interface/sharedtpls/login.tpl
index 2ea5fff..6ca7cdb 100644
--- a/fp-interface/sharedtpls/login.tpl
+++ b/fp-interface/sharedtpls/login.tpl
@@ -1,11 +1,21 @@
 
 <form id="login" method="post" action="{$smarty.const.BLOG_BASEURL}login.php" enctype="multipart/form-data">
 	<div class="input-group">
-        <input placeholder="{$lang.login.user}" class="input_gray mb-0 mt-3 form-control {$error.user|notempty:'field-error'}" type="text" name="user" id="user" {if $smarty.post.user}value="{$smarty.post.user|wp_specialchars:true}"{/if} class="form-control w-100 mw-100" />
-      </div>
-		<div class="input-group">
-        <input placeholder="{$lang.login.pass}" type="password" class="input_gray form-control mt-2 {$error.pass|notempty:'field-error'}" name="pass" id="pass" class="form-control w-100 mw-100 mt-3"/>
-      </div>
+		{if isset($error) && isset($error.user)}
+        	<input placeholder="{$lang.login.user}" class="input_gray mb-0 mt-3 form-control w-100 mw-100 {$error.user|notempty:'field-error'}" type="text" name="user" id="user" {if isset($smarty.post.user)}value="{$smarty.post.user|wp_specialchars:true}"{/if} />
+		{elseif isset($smarty.post.user)}
+			<input placeholder="{$lang.login.user}" class="input_gray mb-0 mt-3 form-control w-100 mw-100" type="text" name="user" id="user" {if $smarty.post.user}value="{$smarty.post.user|wp_specialchars:true}"{/if} /></p>
+		{else}
+			<input placeholder="{$lang.login.user}" class="input_gray mb-0 mt-3 form-control w-100 mw-100" type="text" name="user" id="user" /></p>
+		{/if}
+	</div>
+	<div class="input-group">
+		{if isset($error) && isset($error.pass)}
+        	<input placeholder="{$lang.login.pass}" type="password" class="input_gray form-control w-100 mw-100 mt-3 {$error.pass|notempty:'field-error'}" name="pass" id="pass"/>
+		{else}
+			<input placeholder="{$lang.login.pass}" type="password" class="input_gray form-control w-100 mw-100 mt-3" name="pass" id="pass" /></p>
+		{/if}
+		</div>
 	<div class="buttonbar text-center">
 	<input type="submit" name="submit" id="submit" value="{$lang.login.submit}" class="btn btn-primary shadow mt-3" />
 	{* <input type="submit" name="forgot" id="forgot" value="{$lang.login.forgot}" /> *}
diff --git a/fp-interface/sharedtpls/login_page.tpl b/fp-interface/sharedtpls/login_page.tpl
index 1a4868d..3a2c168 100644
--- a/fp-interface/sharedtpls/login_page.tpl
+++ b/fp-interface/sharedtpls/login_page.tpl
@@ -20,7 +20,7 @@
                   <div class="login_logo text-center">
                     <img src="{$smarty.const.BLOG_BASEURL}admin/res/fp-logo.png" class="img-fluid">
                   </div>
-                  {if $rawcontent} 
+                  {if isset($rawcontent)} 
                     {$content}
                   {else}	
                     {include file=$content}
