diff --git a/admin/panels/entry/admin.entry.write.tpl b/admin/panels/entry/admin.entry.write.tpl
index e676eb6..25e2586 100755
--- a/admin/panels/entry/admin.entry.write.tpl
+++ b/admin/panels/entry/admin.entry.write.tpl
@@ -21,7 +21,12 @@
 	
 		<div id="admin-editor">
 			<p><label for="subject">{$panelstrings.subject}</label><br />
-			<input type="text" {$error.subject|notempty:'class="field-error"'} 
+			{if isset($error) && isset($error.subject) && !empty($error.subject)}
+				{assign var=class value="field-error"}
+			{else}
+				{assign var=class value=""}
+			{/if}
+			<input type="text" class="{$class}" 
 				name="subject" id="subject" 
 				value="{$subject|default:$smarty.request.subject|wp_specialchars:1}" /><br />
 			<input type="hidden" name="timestamp" value="{$date}" />
@@ -32,7 +37,7 @@
 			</p>
 			{toolbar}
 			<p>
-			<textarea name="content" {$error.content|notempty:'class="field-error"'} 
+			<textarea name="content" class="{$class}" 
 			id="content" rows="20" cols="74">{$content|default:$smarty.request.content|htmlspecialchars}</textarea><br />
 			{*here will go a plugin hook*}
 			{action hook=simple_edit_form}
@@ -80,13 +85,13 @@
 {/html_form}
 	{/entry_block}
 
-{if $smarty.get.entry }
+{if isset($smarty.get.entry) }
 
 <div id="admin-otheroptions">	
 
 <h2>{$panelstrings.otheropts}</h2>
 	<ul>
-		{if !$draft}
+		{if !isset($draft)}
 		<li><a href="admin.php?p=entry&amp;entry={$smarty.get.entry}&amp;action=commentlist">
 			{$panelstrings.commmsg}</a></li>
 		{/if}
diff --git a/fp-interface/sharedtpls/comment-form.tpl b/fp-interface/sharedtpls/comment-form.tpl
index 7fd352e..ff23f62 100644
--- a/fp-interface/sharedtpls/comment-form.tpl
+++ b/fp-interface/sharedtpls/comment-form.tpl
@@ -13,23 +13,36 @@
 	
 	{if not $flatpress.loggedin}
 	
-	
-
 	{*<fieldset id="comment-userdata">*}
 	<div id="comment-userdata">
 	
 		<p>
-		<input type="text" {$error.name|notempty:'class="field-error"'} name="name" id="name" value="{$values.name|wp_specialchars:1|default:$cookie.name}" />
+		{if isset($error) && isset($error.name) && !empty($error.name)}
+			{assign var=class value="field-error"}
+		{else}
+			{assign var=class value=""}
+		{/if}
+		<input type="text" class="{$class}" name="name" id="name" value="{$values.name|wp_specialchars:1|default:$cookie.name}" />
 		<label class="textlabel" for="name">{$lang.comments.name}</label>
 		</p>
 		
 		<p>
-		<input type="text" {$error.email|notempty:'class="field-error"'} name="email" id="email" value="{$values.email|wp_specialchars:1|default:$cookie.email}" />
+		{if isset($error) && isset($error.email) && !empty($error.email)}
+			{assign var=class value="field-error"}
+		{else}
+			{assign var=class value=""}
+		{/if}
+		<input type="text" class="{$class}" name="email" id="email" value="{$values.email|wp_specialchars:1|default:$cookie.email}" />
 		<label class="textlabel" for="email">{$lang.comments.email}</label>
 		</p>
 		
 		<p>
-		<input type="text" {$error.url|notempty:'class="field-error"'} name="url" id="url" value="{$values.url|wp_specialchars:1|default:$cookie.url}" />
+		{if isset($error) && isset($error.url) && !empty($error.url)}
+			{assign var=class value="field-error"}
+		{else}
+			{assign var=class value=""}
+		{/if}
+		<input type="text" class="{$class}" name="url" id="url" value="{$values.url|wp_specialchars:1|default:$cookie.url}" />
 		<label class="textlabel" for="url">{$lang.comments.www}</label>
 		</p>
 		
@@ -42,7 +55,12 @@
 	
 	
 	<div class="comment-content">
-			<p><textarea name="content" {$error.content|notempty:'class="field-error"'}
+			{if isset($error) && isset($error.content) && !empty($error.content)}
+				{assign var=class value="field-error"}
+			{else}
+				{assign var=class value=""}
+			{/if}
+			<p><textarea name="content" class="{$class}" 
 			id="content" rows="10" cols="74">{$values.content|wp_specialchars:1}</textarea></p>
 			{*here will go a plugin hook*}
 	</div>