diff --git a/admin/panels/entry/admin.entry.list.tpl b/admin/panels/entry/admin.entry.list.tpl
index 942987a..238a398 100755
--- a/admin/panels/entry/admin.entry.list.tpl
+++ b/admin/panels/entry/admin.entry.list.tpl
@@ -3,18 +3,20 @@
 
 
 
-{draft_block}
-<div id="admin-drafts">
-<p>Your drafts:</p>
-<ul>
-{foreach from=$draft_list key=draftid item=draft}
-	<li>
-		<a href="admin.php?p=entry&amp;entry={$draftid}&amp;action=write">{$draft|truncate:50}</a>
-	</li>
-{/foreach}
-</ul>
-</div>
 
+{draft_block}
+{if isset($draft_list)}
+	<div id="admin-drafts">
+		<p>Your drafts:</p>
+		<ul>
+		{foreach from=$draft_list key=draftid item=draft}
+			<li>
+				<a href="admin.php?p=entry&amp;entry={$draftid}&amp;action=write">{$draft|truncate:50}</a>
+			</li>
+		{/foreach}
+		</ul>
+	</div>
+{/if}
 {/draft_block}
 
 
diff --git a/admin/panels/static/admin.static.write.tpl b/admin/panels/static/admin.static.write.tpl
index ee3b862..31f1f86 100755
--- a/admin/panels/static/admin.static.write.tpl
+++ b/admin/panels/static/admin.static.write.tpl
@@ -24,7 +24,7 @@
 				{assign var=class value=""}
 			{/if}
 			<input type="text" name="subject" id="subject" class="{$class}" 
-			value="{$subject|default:$smarty.request.subject|default:$smarty.request.page|wp_specialchars:1}" /><br />
+			value="{$subject|default:$smarty.request.subject|default:{$smarty.request.page|default:''}|wp_specialchars:1}" /><br />
 			<input type="hidden" name="timestamp" value="{$date}" />
 			</p>
 			<p>
@@ -40,7 +40,7 @@
 				{assign var=class value=""}
 			{/if}
 			<textarea name="content" class="{$class}" id="content" 
-			rows="20" cols="74">{$content|default:$smarty.request.content|htmlspecialchars}</textarea><br />
+			rows="20" cols="74">{$content|default:{$smarty.request.content|default:''}|htmlspecialchars}</textarea><br />
 		{*here will go a plugin hook*}
 			</p>