diff --git a/src/admin/templates/abuse.prefs.tpl b/src/admin/templates/abuse.prefs.tpl
index a9e261b..5fe5f43 100644
--- a/src/admin/templates/abuse.prefs.tpl
+++ b/src/admin/templates/abuse.prefs.tpl
@@ -46,7 +46,7 @@
 					{elseif $fieldInfo.type==2}
 						<input type="checkbox" name="prefs[{$groupName}][{$fieldKey}]" value="1"{if $fieldInfo.value} checked="checked"{/if} />
 					{elseif $fieldInfo.type==1}
-						<input type="text" style="width:85%;" name="prefs[{$groupName}][{$fieldKey}]" value="{text value=$fieldInfo.value allowEmpty=true}" />
+						<input type="text" style="width:85%;" name="prefs[{$groupName}][{$fieldKey}]" value="{if isset($fieldInfo.value)}{text value=$fieldInfo.value allowEmpty=true}{/if}" />
 					{/if}
 				</td>
 			</tr>
diff --git a/src/admin/templates/admins.edit.tpl b/src/admin/templates/admins.edit.tpl
index d5c6110..5eac201 100644
--- a/src/admin/templates/admins.edit.tpl
+++ b/src/admin/templates/admins.edit.tpl
@@ -7,15 +7,15 @@
 			<tr>
 				<td width="40" valign="top" rowspan="6"><img src="{$tpldir}images/ico_users.png" border="0" alt="" width="32" height="32" /></td>
 				<td class="td1" width="220">{lng p="username"}:</td>
-				<td class="td2"><input type="text" size="28" id="username" name="username" value="{text value=$admin.username}" /></td>
+				<td class="td2"><input type="text" size="28" id="username" name="username" value="{if isset($admin.username)}{text value=$admin.username}{/if}" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="firstname"}:</td>
-				<td class="td2"><input type="text" size="36" id="firstname" name="firstname" value="{text value=$admin.firstname allowEmpty=true}" /></td>
+				<td class="td2"><input type="text" size="36" id="firstname" name="firstname" value="{if isset($admin.firstname)}{text value=$admin.firstname allowEmpty=true}{/if}" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="lastname"}:</td>
-				<td class="td2"><input type="text" size="36" id="lastname" name="lastname" value="{text value=$admin.lastname allowEmpty=true}" /></td>
+				<td class="td2"><input type="text" size="36" id="lastname" name="lastname" value="{if isset($admin.lastname)}{text value=$admin.lastname allowEmpty=true}{/if}" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="type"}:</td>
diff --git a/src/admin/templates/groups.edit.tpl b/src/admin/templates/groups.edit.tpl
index c649320..94a8824 100644
--- a/src/admin/templates/groups.edit.tpl
+++ b/src/admin/templates/groups.edit.tpl
@@ -8,7 +8,7 @@
 				<table width="100%">
 					<tr>
 						<td class="td1" width="160">{lng p="title"}:</td>
-						<td class="td2"><input type="text" name="titel" value="{text value=$group.titel allowEmpty=true}" style="width:85%;" /></td>
+						<td class="td2"><input type="text" name="titel" value="{if isset($group.titel)}{text value=$group.titel allowEmpty=true}{/if}" style="width:85%;" /></td>
 					</tr>
 					<tr>
 						<td class="td1">{lng p="htmlview"}?</td>
@@ -235,11 +235,11 @@
 					</tr>
 					<tr>
 						<td class="td1" width="160">{lng p="smsfrom"}:</td>
-						<td class="td2"><input type="text" name="sms_from" value="{text value=$group.sms_from allowEmpty=true}" style="width:85%;" /></td>
+						<td class="td2"><input type="text" name="sms_from" value="{if isset($group.sms_from)}{text value=$group.sms_from allowEmpty=true}{/if}" style="width:85%;" /></td>
 					</tr>
 					<tr>
 						<td class="td1">{lng p="smssig"}:</td>
-						<td class="td2"><input type="text" name="sms_sig" value="{text value=$group.sms_sig allowEmpty=true}" style="width:85%;" /></td>
+						<td class="td2"><input type="text" name="sms_sig" value="{if isset($group.sms_sig)}{text value=$group.sms_sig allowEmpty=true}{/if}" style="width:85%;" /></td>
 					</tr>
 					<tr>
 						<td class="td1">{lng p="mailsig"}:</td>
@@ -266,7 +266,7 @@
 							{elseif $fieldInfo.type==2}
 								<input type="checkbox" name="{$fieldKey}" value="1"{if $fieldInfo.value} checked="checked"{/if} />
 							{elseif $fieldInfo.type==1}
-								<input type="text" style="width:85%;" name="{$fieldKey}" value="{text value=$fieldInfo.value allowEmpty=true}" />
+								<input type="text" style="width:85%;" name="{$fieldKey}" value="{if isset($fieldInfo.value)}{text value=$fieldInfo.value allowEmpty=true}{/if}" />
 							{/if}
 					</tr>
 					{/foreach}
diff --git a/src/admin/templates/logs.tpl b/src/admin/templates/logs.tpl
index 3f6aa68..2abe1e6 100644
--- a/src/admin/templates/logs.tpl
+++ b/src/admin/templates/logs.tpl
@@ -65,7 +65,7 @@
 			<tr>
 				<td class="td1">{lng p="search"}:</td>
 				<td class="td2">
-						<input type="text" name="q" value="{text value=$q allowEmpty=true}" size="36" style="width:85%;" />
+						<input type="text" name="q" value="{if isset($q)}{text value=$q allowEmpty=true}{/if}" size="36" style="width:85%;" />
 				</td>
 			</tr>
 		</table>
diff --git a/src/admin/templates/maintenance.inactive.list.tpl b/src/admin/templates/maintenance.inactive.list.tpl
index a26af60..fb3337c 100644
--- a/src/admin/templates/maintenance.inactive.list.tpl
+++ b/src/admin/templates/maintenance.inactive.list.tpl
@@ -8,8 +8,8 @@
 <input type="hidden" name="queryAction" value="show" />
 {if $smarty.post.queryTypeLogin}<input type="hidden" name="queryTypeLogin" value="on" />{/if}
 {if $smarty.post.queryTypeGroups}<input type="hidden" name="queryTypeGroups" value="on" />{/if}
-{if $smarty.post.loginDays}<input type="hidden" name="loginDays" value="{text value=$smarty.post.loginDays allowEmpty=true}" />{/if}
-{foreach from=$smarty.post.groups item=item key=key}<input type="hidden" name="groups[{$key}]" value="{text value=$item allowEmpty=true}" />{/foreach}
+{if $smarty.post.loginDays}<input type="hidden" name="loginDays" value="{if isset($smarty.post.loginDays)}{text value=$smarty.post.loginDays allowEmpty=true}{/if}" />{/if}
+{foreach from=$smarty.post.groups item=item key=key}<input type="hidden" name="groups[{$key}]" value="{if isset($item)}{text value=$item allowEmpty=true}{/if}" />{/foreach}
 
 <fieldset>
 	<legend>{lng p="inactiveusers"}</legend>
diff --git a/src/admin/templates/newsletter.templates.edit.tpl b/src/admin/templates/newsletter.templates.edit.tpl
index 5412642..3eb92d3 100644
--- a/src/admin/templates/newsletter.templates.edit.tpl
+++ b/src/admin/templates/newsletter.templates.edit.tpl
@@ -6,7 +6,7 @@
 		<tr>
 			<td width="40" valign="top" rowspan="7"><img src="{$tpldir}images/newsletter.png" border="0" alt="" width="32" height="32" /></td>
 			<td class="td1" width="120">{lng p="title"}:</td>
-			<td class="td2"><input type="text" id="subject" name="title" value="{text value=$tpl.title allowEmpty=true}" size="42" /></td>
+			<td class="td2"><input type="text" id="subject" name="title" value="{if isset($tpl.title)}{text value=$tpl.title allowEmpty=true}{/if}" size="42" /></td>
 		</tr>
 		<tr>
 			<td class="td1" >{lng p="mode"}:</td>
@@ -20,11 +20,11 @@
 		</tr>
 		<tr>
 			<td class="td1">{lng p="from"}:</td>
-			<td class="td2"><input type="text" id="from" name="from" value="{text value=$tpl.from allowEmpty=true}" size="42" /></td>
+			<td class="td2"><input type="text" id="from" name="from" value="{if isset($tpl.from)}{text value=$tpl.from allowEmpty=true}{/if}" size="42" /></td>
 		</tr>
 		<tr>
 			<td class="td1">{lng p="subject"}:</td>
-			<td class="td2"><input type="text" id="subject" name="subject" value="{text value=$tpl.subject allowEmpty=true}" size="42" /></td>
+			<td class="td2"><input type="text" id="subject" name="subject" value="{if isset($tpl.subject)}{text value=$tpl.subject allowEmpty=true}{/if}" size="42" /></td>
 		</tr>
 		<tr>
 			<td class="td1">{lng p="priority"}:</td>
diff --git a/src/admin/templates/newsletter.templates.tpl b/src/admin/templates/newsletter.templates.tpl
index eb370af..fec03bf 100644
--- a/src/admin/templates/newsletter.templates.tpl
+++ b/src/admin/templates/newsletter.templates.tpl
@@ -67,7 +67,7 @@
 		</tr>
 		<tr>
 			<td class="td1">{lng p="from"}:</td>
-			<td class="td2"><input type="text" id="from" name="from" value="{text value=$from}" size="42" /></td>
+			<td class="td2"><input type="text" id="from" name="from" value="{if isset($from)}{text value=$from}{/if}" size="42" /></td>
 		</tr>
 		<tr>
 			<td class="td1">{lng p="subject"}:</td>
diff --git a/src/admin/templates/newsletter.tpl b/src/admin/templates/newsletter.tpl
index bff99c3..7ba05c6 100644
--- a/src/admin/templates/newsletter.tpl
+++ b/src/admin/templates/newsletter.tpl
@@ -75,7 +75,7 @@
 		</tr>
 		<tr>
 			<td class="td1">{lng p="from"}:</td>
-			<td class="td2"><input type="text" id="from" name="from" value="{text value=$from}" size="42" /></td>
+			<td class="td2"><input type="text" id="from" name="from" value="{if isset($from)}{text value=$from}{/if}" size="42" /></td>
 		</tr>
 		<tr>
 			<td class="td1">{lng p="subject"}:</td>
diff --git a/src/admin/templates/prefs.ads.edit.tpl b/src/admin/templates/prefs.ads.edit.tpl
index a5bfd3c..2a117f5 100644
--- a/src/admin/templates/prefs.ads.edit.tpl
+++ b/src/admin/templates/prefs.ads.edit.tpl
@@ -11,7 +11,7 @@
 			</tr>
 			<tr>
 				<td class="td1" width="160">{lng p="category"}:</td>
-				<td class="td2"><input type="text" name="category" size="36" value="{text value=$ad.category allowEmpty=true}" /></td>
+				<td class="td2"><input type="text" name="category" size="36" value="{if isset($ad.category)}{text value=$ad.category allowEmpty=true}{/if}" /></td>
 			</tr>
 			<tr>
 				<td class="td1" width="160">{lng p="weight"}:</td>
diff --git a/src/admin/templates/prefs.coupons.edit.tpl b/src/admin/templates/prefs.coupons.edit.tpl
index 64da973..41a735c 100644
--- a/src/admin/templates/prefs.coupons.edit.tpl
+++ b/src/admin/templates/prefs.coupons.edit.tpl
@@ -7,7 +7,7 @@
 				<td width="40" valign="top" rowspan="6"><img src="{$tpldir}images/coupon32.png" border="0" alt="" width="32" height="32" /></td>
 				<td class="td1" width="150">{lng p="code"}:</td>
 				<td class="td2">
-					<input type="text" name="code" value="{text value=$coupon.code}" style="width:85%;" />
+					<input type="text" name="code" value="{if isset($coupon.code)}{text value=$coupon.code}{/if}" style="width:85%;" />
 				</td>
 			</tr>
 			<tr>
@@ -16,7 +16,7 @@
 					<input type="checkbox" onchange="EBID('count').value=this.checked?'-1':'0';"{if $coupon.anzahl==-1} checked="checked"{/if} id="count_unlim" />
 					<label for="count_unlim"><b>{lng p="unlimited"}</b></label>
 					{lng p="or"}
-					<input type="text" size="6" name="anzahl" id="count" value="{text value=$coupon.anzahl}" onkeyup="EBID('count_unlim').checked=this.value=='-1';" />
+					<input type="text" size="6" name="anzahl" id="count" value="{if isset($coupon.anzahl)}{text value=$coupon.anzahl}{/if}" onkeyup="EBID('count_unlim').checked=this.value=='-1';" />
 				</td>
 			</tr>
 			<tr>
diff --git a/src/admin/templates/prefs.profilefields.edit.tpl b/src/admin/templates/prefs.profilefields.edit.tpl
index 8438f41..97d7b91 100644
--- a/src/admin/templates/prefs.profilefields.edit.tpl
+++ b/src/admin/templates/prefs.profilefields.edit.tpl
@@ -6,11 +6,11 @@
 			<tr>
 				<td width="40" valign="top" rowspan="6"><img src="{$tpldir}images/field32.png" border="0" alt="" width="32" height="32" /></td>
 				<td class="td1" width="150">{lng p="field"}:</td>
-				<td class="td2"><input type="text" style="width:85%;" name="feld" value="{text value=$field.feld allowEmpty=true}" /></td>
+				<td class="td2"><input type="text" style="width:85%;" name="feld" value="{if isset($field.feld)}{text value=$field.feld allowEmpty=true}{/if}" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="validityrule"}:</td>
-				<td class="td2"><input type="text" style="width:85%;" name="rule" value="{text value=$field.rule allowEmpty=true}" />
+				<td class="td2"><input type="text" style="width:85%;" name="rule" value="{if isset($field.rule)}{text value=$field.rule allowEmpty=true}{/if}" />
 					<br /><small>{lng p="pfrulenote"}</small></td>
 			</tr>
 			<tr>
@@ -36,7 +36,7 @@
 			</tr>
 			<tr>
 				<td class="td1">{lng p="options"}:</td>
-				<td class="td2"><input type="text" style="width:85%;" name="extra" value="{text value=$field.extra allowEmpty=true}" />
+				<td class="td2"><input type="text" style="width:85%;" name="extra" value="{if isset($field.extra)}{text value=$field.extra allowEmpty=true}{/if}" />
 					<br /><small>{lng p="optionsdesc"}</small></td>
 			</tr>
 		</table>
diff --git a/src/admin/templates/prefs.recvrules.edit.tpl b/src/admin/templates/prefs.recvrules.edit.tpl
index 14d9e2e..ec4fd5b 100644
--- a/src/admin/templates/prefs.recvrules.edit.tpl
+++ b/src/admin/templates/prefs.recvrules.edit.tpl
@@ -6,11 +6,11 @@
 			<tr>
 				<td width="40" valign="top" rowspan="5"><img src="{$tpldir}images/rule32.png" border="0" alt="" width="32" height="32" /></td>
 				<td class="td1" width="150">{lng p="field"}:</td>
-				<td class="td2"><input type="text" style="width:85%;" name="field" value="{text value=$rule.field}" /></td>
+				<td class="td2"><input type="text" style="width:85%;" name="field" value="{if isset($rule.field)}{text value=$rule.field}{/if}" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="expression"}:</td>
-				<td class="td2"><input type="text" style="width:85%;" name="expression" value="{text value=$rule.expression allowEmpty=true}" /></td>
+				<td class="td2"><input type="text" style="width:85%;" name="expression" value="{if isset($rule.expression)}{text value=$rule.expression allowEmpty=true}{/if}" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="action"}:</td>
diff --git a/src/admin/templates/prefs.sms.types.edit.tpl b/src/admin/templates/prefs.sms.types.edit.tpl
index af82372..c884e86 100644
--- a/src/admin/templates/prefs.sms.types.edit.tpl
+++ b/src/admin/templates/prefs.sms.types.edit.tpl
@@ -6,7 +6,7 @@
 			<tr>
 				<td width="40" valign="top" rowspan="6"><img src="{$tpldir}images/type32.png" border="0" alt="" width="32" height="32" /></td>
 				<td class="td1" width="150">{lng p="title"}:</td>
-				<td class="td2"><input type="text" style="width:85%;" name="titel" value="{text value=$type.titel}" /></td>
+				<td class="td2"><input type="text" style="width:85%;" name="titel" value="{if isset($type.titel)}{text value=$type.titel}{/if}" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="gateway"}:</td>
@@ -19,7 +19,7 @@
 			</tr>
 			<tr>
 				<td class="td1">{lng p="type"}:</td>
-				<td class="td2"><input type="text" size="6" name="typ" value="{text value=$type.typ allowEmpty=true}" /></td>
+				<td class="td2"><input type="text" size="6" name="typ" value="{if isset($type.typ)}{text value=$type.typ allowEmpty=true}{/if}" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="price"}:</td>
diff --git a/src/admin/templates/users.list.tpl b/src/admin/templates/users.list.tpl
index 79333af..c32c859 100644
--- a/src/admin/templates/users.list.tpl
+++ b/src/admin/templates/users.list.tpl
@@ -4,7 +4,7 @@
 <input type="hidden" name="sortOrder" id="sortOrder" value="{$sortOrder}" />
 <input type="hidden" name="singleAction" id="singleAction" value="" />
 <input type="hidden" name="singleID" id="singleID" value="" />
-{if $queryString}<input type="hidden" name="query" id="query" value="{text value=$queryString}" />{/if}
+{if !empty($queryString)}<input type="hidden" name="query" id="query" value="{text value=$queryString}" />{/if}
 
 {if isset($searchQuery)}
 <fieldset>
@@ -128,7 +128,7 @@
 			</td>
 			<td colspan="3" class="td2">
 				{foreach from=$fields item=field key=fieldID}
-					<input type="checkbox" name="field_{$fieldID}" id="field_{$fieldID}"{if $field.checked} checked="checked"{/if} />
+					<input type="checkbox" name="field_{$fieldID}" id="field_{$fieldID}"{if !empty($field.checked)} checked="checked"{/if} />
 						<label for="field_{$fieldID}"><b>{text value=$field.feld}</b></label><br />
 				{/foreach}
 			</td>
diff --git a/src/admin/templates/users.transactions.tpl b/src/admin/templates/users.transactions.tpl
index a75341e..2d6b0ec 100644
--- a/src/admin/templates/users.transactions.tpl
+++ b/src/admin/templates/users.transactions.tpl
@@ -4,7 +4,7 @@
 <input type="hidden" name="sortOrder" id="sortOrder" value="{$sortOrder}" />
 <input type="hidden" name="singleAction" id="singleAction" value="" />
 <input type="hidden" name="singleID" id="singleID" value="" />
-{if $queryString}<input type="hidden" name="query" id="query" value="{text value=$queryString}" />{/if}
+{if !empty($queryString)}<input type="hidden" name="query" id="query" value="{text value=$queryString}" />{/if}
 
 <fieldset>
 	<legend>{lng p="transactions"} ({email value=$user.email}, #{$user.id})</legend>
diff --git a/src/admin/templates/workgroups.folders.edit.tpl b/src/admin/templates/workgroups.folders.edit.tpl
index b237c0e..ec42dc6 100644
--- a/src/admin/templates/workgroups.folders.edit.tpl
+++ b/src/admin/templates/workgroups.folders.edit.tpl
@@ -6,7 +6,7 @@
 			<tr>
 				<td width="40" valign="top" rowspan="2"><img src="{$tpldir}images/workgroup_mail32.png" border="0" alt="" width="32" height="32" /></td>
 				<td class="td1" width="130">{lng p="title"}:</td>
-				<td class="td2"><input type="text" name="titel" value="{text value=$folder.titel}" style="width:85%;" /></td>
+				<td class="td2"><input type="text" name="titel" value="{if isset($folder.titel)}{text value=$folder.titel}{/if}" style="width:85%;" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="itemsperpage"}:</td>
diff --git a/src/plugins/templates/bms.admin.deliveryrules.tpl b/src/plugins/templates/bms.admin.deliveryrules.tpl
index 51c6165..0d7f8df 100644
--- a/src/plugins/templates/bms.admin.deliveryrules.tpl
+++ b/src/plugins/templates/bms.admin.deliveryrules.tpl
@@ -26,14 +26,14 @@
 						<option value="2"{if $rule.rule_subject==2} selected="selected"{/if}>{lng p="bms_recipient"}</option>
 						<option value="0"{if $rule.rule_subject==0} selected="selected"{/if}>{lng p="bms_recpdomain"}</option>
 					</select></td>
-				<td><input type="text" name="rules[{$ruleID}][rule]" value="{text value=$rule.rule allowEmpty=true}" size="16" /></td>
+				<td><input type="text" name="rules[{$ruleID}][rule]" value="{if isset($rule.rule)}{text value=$rule.rule allowEmpty=true}{/if}" size="16" /></td>
 				<td><select name="rules[{$ruleID}][target]">
 						<option value="0"{if $rule.target==0} selected="selected"{/if}>{lng p="bms_target_0"}</option>
 						<option value="1"{if $rule.target==1} selected="selected"{/if}>{lng p="bms_redirecttosendmail"}</option>
 						<option value="2"{if $rule.target==2} selected="selected"{/if}>{lng p="bms_redirecttosmtprelay"}</option>
 						<option value="3"{if $rule.target==3} selected="selected"{/if}>{lng p="bms_target_3"}</option>
 					</select></td>
-				<td><input type="text" name="rules[{$ruleID}][target_param]" value="{text value=$rule.target_param allowEmpty=true}" size="16" /></td>
+				<td><input type="text" name="rules[{$ruleID}][target_param]" value="{if isset($rule.target_param)}{text value=$rule.target_param allowEmpty=true}{/if}" size="16" /></td>
 				<td>
 					<input type="checkbox" name="rules[{$ruleID}][flags][]" value="1" id="rule{$ruleID}_flag1"{if $rule.flags&1} checked="checked"{/if} />
 						<label for="rule{$ruleID}_flag1">{lng p="bms_flag_ci"}</label><br />
diff --git a/src/plugins/templates/bms.admin.imap.tpl b/src/plugins/templates/bms.admin.imap.tpl
index 96ad3ef..a3fd5ba 100644
--- a/src/plugins/templates/bms.admin.imap.tpl
+++ b/src/plugins/templates/bms.admin.imap.tpl
@@ -6,7 +6,7 @@
 			<tr>
 				<td align="left" rowspan="6" valign="top" width="40"><img src="../plugins/templates/images/bms_common.png" border="0" alt="" width="32" height="32" /></td>
 				<td class="td1" width="200">{lng p="bms_greeting"}:</td>
-				<td class="td2"><input type="text" name="imapgreeting" value="{text value=$bms_prefs.imapgreeting allowEmpty=true}" size="32" style="width:95%;" /></td>
+				<td class="td2"><input type="text" name="imapgreeting" value="{if isset($bms_prefs.imapgreeting)}{text value=$bms_prefs.imapgreeting allowEmpty=true}{/if}" size="32" style="width:95%;" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="bms_timeout"}:</td>
@@ -56,19 +56,19 @@
 			</tr>
 			<tr>
 				<td class="td1">{lng p="bms_folder_sent"}:</td>
-				<td class="td2"><input type="text" name="imap_folder_sent" value="{text value=$bms_prefs.imap_folder_sent allowEmpty=true}" size="32" /></td>
+				<td class="td2"><input type="text" name="imap_folder_sent" value="{if isset($bms_prefs.imap_folder_sent)}{text value=$bms_prefs.imap_folder_sent allowEmpty=true}{/if}" size="32" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="bms_folder_spam"}:</td>
-				<td class="td2"><input type="text" name="imap_folder_spam" value="{text value=$bms_prefs.imap_folder_spam allowEmpty=true}" size="32" /></td>
+				<td class="td2"><input type="text" name="imap_folder_spam" value="{if isset($bms_prefs.imap_folder_spam)}{text value=$bms_prefs.imap_folder_spam allowEmpty=true}{/if}" size="32" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="bms_folder_drafts"}:</td>
-				<td class="td2"><input type="text" name="imap_folder_drafts" value="{text value=$bms_prefs.imap_folder_drafts allowEmpty=true}" size="32" /></td>
+				<td class="td2"><input type="text" name="imap_folder_drafts" value="{if isset($bms_prefs.imap_folder_drafts)}{text value=$bms_prefs.imap_folder_drafts allowEmpty=true}{/if}" size="32" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="bms_folder_trash"}:</td>
-				<td class="td2"><input type="text" name="imap_folder_trash" value="{text value=$bms_prefs.imap_folder_trash allowEmpty=true}" size="32" /></td>
+				<td class="td2"><input type="text" name="imap_folder_trash" value="{if isset($bms_prefs.imap_folder_trash)}{text value=$bms_prefs.imap_folder_trash allowEmpty=true}{/if}" size="32" /></td>
 			</tr>
 		</table>
 	</fieldset>
@@ -110,9 +110,9 @@
 			<tr>
 				<td class="td1" width="200">{lng p="bms_serverport"}:</td>
 				<td class="td2">
-					<input type="text" name="apns_host" value="{text value=$bms_prefs.apns_host allowEmpty=true}" size="32" />
+					<input type="text" name="apns_host" value="{if isset($bms_prefs.apns_host)}{text value=$bms_prefs.apns_host allowEmpty=true}{/if}" size="32" />
 					:
-					<input type="text" name="apns_port" value="{text value=$bms_prefs.apns_port allowEmpty=true}" size="6" />
+					<input type="text" name="apns_port" value="{if isset($bms_prefs.apns_port)}{text value=$bms_prefs.apns_port allowEmpty=true}{/if}" size="6" />
 				</td>
 			</tr>
 			<tr>
diff --git a/src/plugins/templates/bms.admin.logs.tpl b/src/plugins/templates/bms.admin.logs.tpl
index 564732a..5e3fa11 100644
--- a/src/plugins/templates/bms.admin.logs.tpl
+++ b/src/plugins/templates/bms.admin.logs.tpl
@@ -97,7 +97,7 @@
 			<tr>
 				<td class="td1">{lng p="search"}:</td>
 				<td class="td2">
-						<input type="text" name="q" value="{text value=$q allowEmpty=true}" size="36" style="width:85%;" />
+						<input type="text" name="q" value="{if isset($q)}{text value=$q allowEmpty=true}{/if}" size="36" style="width:85%;" />
 				</td>
 			</tr>
 		</table>
diff --git a/src/plugins/templates/bms.admin.msgqueue.tpl b/src/plugins/templates/bms.admin.msgqueue.tpl
index 6827878..a082bc6 100644
--- a/src/plugins/templates/bms.admin.msgqueue.tpl
+++ b/src/plugins/templates/bms.admin.msgqueue.tpl
@@ -32,7 +32,7 @@
 			<tr>
 				<td class="td1">{lng p="bms_control_addr"}:</td>
 				<td class="td2">
-					<input type="text" name="control_addr" value="{text value=$bms_prefs.control_addr allowEmpty=true}" size="16" />
+					<input type="text" name="control_addr" value="{if isset($bms_prefs.control_addr)}{text value=$bms_prefs.control_addr allowEmpty=true}{/if}" size="16" />
 					<a href="#" onclick="alert('{lng p="bms_control_addr_help"}');"><img src="{$tpldir}images/info.png" border="0" alt="{lng p="help"}" /></a>
 				</td>
 			</tr>
@@ -61,7 +61,7 @@
 			<tr>
 				<td align="left" valign="top" width="40" rowspan="2"><img src="../plugins/templates/images/bms_inbound.png" border="0" alt="" width="32" height="32" /></td>
 				<td class="td1" width="200">{lng p="bms_php_path"}:</td>
-				<td class="td2"><input type="text" name="php_path" value="{text value=$bms_prefs.php_path allowEmpty=true}" size="32" /></td>
+				<td class="td2"><input type="text" name="php_path" value="{if isset($bms_prefs.php_path)}{text value=$bms_prefs.php_path allowEmpty=true}{/if}" size="32" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="bms_reuseprocess"}?</td>
@@ -88,14 +88,14 @@
 			<tr>
 				<td>&nbsp;</td>
 				<td class="td1">{lng p="sendmailpath"}:</td>
-				<td class="td2"><input type="text" name="outbound_sendmail_path" value="{text value=$bms_prefs.outbound_sendmail_path allowEmpty=true}" size="32" /></td>
+				<td class="td2"><input type="text" name="outbound_sendmail_path" value="{if isset($bms_prefs.outbound_sendmail_path)}{text value=$bms_prefs.outbound_sendmail_path allowEmpty=true}{/if}" size="32" /></td>
 			</tr>
 			</tbody>
 			<tbody id="outbound_smtp_prefs" style="display:{if $bms_prefs.outbound_target!=1}none{/if};">
 			<tr>
 				<td rowspan="5">&nbsp;</td>
 				<td class="td1">{lng p="smtphost"}:</td>
-				<td class="td2"><input type="text" name="outbound_smtp_relay_host" value="{text value=$bms_prefs.outbound_smtp_relay_host allowEmpty=true}" size="32" /></td>
+				<td class="td2"><input type="text" name="outbound_smtp_relay_host" value="{if isset($bms_prefs.outbound_smtp_relay_host)}{text value=$bms_prefs.outbound_smtp_relay_host allowEmpty=true}{/if}" size="32" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="smtpport"}:</td>
@@ -136,7 +136,7 @@
 			</tr>
 			<tr>
 				<td class="td1">{lng p="bms_signature_sep"}:</td>
-				<td class="td2"><input type="text" name="outbound_signature_sep" value="{text value=$bms_prefs.outbound_signature_sep allowEmpty=true}" size="54" /></td>
+				<td class="td2"><input type="text" name="outbound_signature_sep" value="{if isset($bms_prefs.outbound_signature_sep)}{text value=$bms_prefs.outbound_signature_sep allowEmpty=true}{/if}" size="54" /></td>
 			</tr>
 		</table>
 		{/if}
diff --git a/src/plugins/templates/bms.admin.pop3.tpl b/src/plugins/templates/bms.admin.pop3.tpl
index 9615c20..98cae10 100644
--- a/src/plugins/templates/bms.admin.pop3.tpl
+++ b/src/plugins/templates/bms.admin.pop3.tpl
@@ -6,7 +6,7 @@
 			<tr>
 				<td align="left" rowspan="4" valign="top" width="40"><img src="../plugins/templates/images/bms_common.png" border="0" alt="" width="32" height="32" /></td>
 				<td class="td1" width="200">{lng p="bms_greeting"}:</td>
-				<td class="td2"><input type="text" name="pop3greeting" value="{text value=$bms_prefs.pop3greeting allowEmpty=true}" size="32" style="width:95%;" /></td>
+				<td class="td2"><input type="text" name="pop3greeting" value="{if isset($bms_prefs.pop3greeting)}{text value=$bms_prefs.pop3greeting allowEmpty=true}{/if}" size="32" style="width:95%;" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="bms_timeout"}:</td>
diff --git a/src/plugins/templates/bms.admin.queue.tpl b/src/plugins/templates/bms.admin.queue.tpl
index 672370b..7007799 100644
--- a/src/plugins/templates/bms.admin.queue.tpl
+++ b/src/plugins/templates/bms.admin.queue.tpl
@@ -111,7 +111,7 @@
 		<tr>
 			<td class="td1" width="80">{lng p="searchfor"}:</td>
 			<td class="td2">
-				<input type="text" name="query" size="36" value="{text value=$query allowEmpty=true}" />
+				<input type="text" name="query" size="36" value="{if isset($query)}{text value=$query allowEmpty=true}{/if}" />
 			</td>
 		</tr>
 	</table>
diff --git a/src/plugins/templates/bms.admin.smtp.tpl b/src/plugins/templates/bms.admin.smtp.tpl
index bbe06a1..45bf3d3 100644
--- a/src/plugins/templates/bms.admin.smtp.tpl
+++ b/src/plugins/templates/bms.admin.smtp.tpl
@@ -6,7 +6,7 @@
 			<tr>
 				<td align="left" rowspan="8" valign="top" width="40"><img src="../plugins/templates/images/bms_common.png" border="0" alt="" width="32" height="32" /></td>
 				<td class="td1" width="200">{lng p="bms_greeting"}:</td>
-				<td class="td2"><input type="text" name="smtpgreeting" value="{text value=$bms_prefs.smtpgreeting allowEmpty=true}" size="32" style="width:95%;" /></td>
+				<td class="td2"><input type="text" name="smtpgreeting" value="{if isset($bms_prefs.smtpgreeting)}{text value=$bms_prefs.smtpgreeting allowEmpty=true}{/if}" size="32" style="width:95%;" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="bms_timeout"}:</td>
diff --git a/src/plugins/templates/jfchatauth.plugin.prefs.tpl b/src/plugins/templates/jfchatauth.plugin.prefs.tpl
index bbc1772..71067b2 100644
--- a/src/plugins/templates/jfchatauth.plugin.prefs.tpl
+++ b/src/plugins/templates/jfchatauth.plugin.prefs.tpl
@@ -10,23 +10,23 @@
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="host"}:</td>
-			<td class="td2"><input type="text" name="mysqlHost" value="{text value=$jfchat_prefs.mysqlHost}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlHost" value="{if isset($jfchat_prefs.mysqlHost)}{text value=$jfchat_prefs.mysqlHost}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="user"}:</td>
-			<td class="td2"><input type="text" name="mysqlUser" value="{text value=$jfchat_prefs.mysqlUser}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlUser" value="{if isset($jfchat_prefs.mysqlUser)}{text value=$jfchat_prefs.mysqlUser}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="password"}:</td>
-			<td class="td2"><input type="password" name="mysqlPass" value="{text value=$jfchat_prefs.mysqlPass}" size="36" /></td>
+			<td class="td2"><input type="password" name="mysqlPass" value="{if isset($jfchat_prefs.mysqlPass)}{text value=$jfchat_prefs.mysqlPass}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="db"}:</td>
-			<td class="td2"><input type="text" name="mysqlDB" value="{text value=$jfchat_prefs.mysqlDB}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlDB" value="{if isset($jfchat_prefs.mysqlDB)}{text value=$jfchat_prefs.mysqlDB}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL Prefix:</td>
-			<td class="td2"><input type="text" name="mysqlPrefix" value="{text value=$jfchat_prefs.mysqlPrefix allowEmpty=true}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlPrefix" value="{if isset($jfchat_prefs.mysqlPrefix)}{text value=$jfchat_prefs.mysqlPrefix allowEmpty=true}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">{lng p="user"}-{lng p="domain"}:</td>
diff --git a/src/plugins/templates/joomlaauth.plugin.prefs.tpl b/src/plugins/templates/joomlaauth.plugin.prefs.tpl
index 14fa4fa..19f015b 100644
--- a/src/plugins/templates/joomlaauth.plugin.prefs.tpl
+++ b/src/plugins/templates/joomlaauth.plugin.prefs.tpl
@@ -10,23 +10,23 @@
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="host"}:</td>
-			<td class="td2"><input type="text" name="mysqlHost" value="{text value=$joomla_prefs.mysqlHost}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlHost" value="{if isset($joomla_prefs.mysqlHost)}{text value=$joomla_prefs.mysqlHost}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="user"}:</td>
-			<td class="td2"><input type="text" name="mysqlUser" value="{text value=$joomla_prefs.mysqlUser}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlUser" value="{if isset($joomla_prefs.mysqlUser)}{text value=$joomla_prefs.mysqlUser}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="password"}:</td>
-			<td class="td2"><input type="password" name="mysqlPass" value="{text value=$joomla_prefs.mysqlPass}" size="36" /></td>
+			<td class="td2"><input type="password" name="mysqlPass" value="{if isset($joomla_prefs.mysqlPass)}{text value=$joomla_prefs.mysqlPass}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="db"}:</td>
-			<td class="td2"><input type="text" name="mysqlDB" value="{text value=$joomla_prefs.mysqlDB}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlDB" value="{if isset($joomla_prefs.mysqlDB)}{text value=$joomla_prefs.mysqlDB}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL Prefix:</td>
-			<td class="td2"><input type="text" name="mysqlPrefix" value="{text value=$joomla_prefs.mysqlPrefix allowEmpty=true}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlPrefix" value="{if isset($joomla_prefs.mysqlPrefix)}{text value=$joomla_prefs.mysqlPrefix allowEmpty=true}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">{lng p="user"}-{lng p="domain"}:</td>
diff --git a/src/plugins/templates/koobi7auth.plugin.prefs.tpl b/src/plugins/templates/koobi7auth.plugin.prefs.tpl
index 3c5ee30..e06a233 100644
--- a/src/plugins/templates/koobi7auth.plugin.prefs.tpl
+++ b/src/plugins/templates/koobi7auth.plugin.prefs.tpl
@@ -10,23 +10,23 @@
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="host"}:</td>
-			<td class="td2"><input type="text" name="mysqlHost" value="{text value=$koobi7_prefs.mysqlHost}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlHost" value="{if isset($koobi7_prefs.mysqlHost)}{text value=$koobi7_prefs.mysqlHost}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="user"}:</td>
-			<td class="td2"><input type="text" name="mysqlUser" value="{text value=$koobi7_prefs.mysqlUser}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlUser" value="{if isset($koobi7_prefs.mysqlUser)}{text value=$koobi7_prefs.mysqlUser}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="password"}:</td>
-			<td class="td2"><input type="password" name="mysqlPass" value="{text value=$koobi7_prefs.mysqlPass}" size="36" /></td>
+			<td class="td2"><input type="password" name="mysqlPass" value="{if isset($koobi7_prefs.mysqlPass)}{text value=$koobi7_prefs.mysqlPass}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="db"}:</td>
-			<td class="td2"><input type="text" name="mysqlDB" value="{text value=$koobi7_prefs.mysqlDB}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlDB" value="{if isset($koobi7_prefs.mysqlDB)}{text value=$koobi7_prefs.mysqlDB}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL Prefix:</td>
-			<td class="td2"><input type="text" name="mysqlPrefix" value="{text value=$koobi7_prefs.mysqlPrefix allowEmpty=true}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlPrefix" value="{if isset($koobi7_prefs.mysqlPrefix)}{text value=$koobi7_prefs.mysqlPrefix allowEmpty=true}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">{lng p="user"}-{lng p="domain"}:</td>
diff --git a/src/plugins/templates/modfax.admin.gateways.edit.tpl b/src/plugins/templates/modfax.admin.gateways.edit.tpl
index 1c1973c..7e7cb2b 100644
--- a/src/plugins/templates/modfax.admin.gateways.edit.tpl
+++ b/src/plugins/templates/modfax.admin.gateways.edit.tpl
@@ -6,7 +6,7 @@
 			<tr>
 				<td width="40" valign="top" rowspan="4"><img src="../plugins/templates/images/modfax_gateway.png" border="0" alt="" width="32" height="32" /></td>
 				<td class="td1" width="150">{lng p="title"}:</td>
-				<td class="td2"><input type="text" style="width:85%;" id="title" name="title" value="{text value=$gateway.title allowEmpty=true}" /></td>
+				<td class="td2"><input type="text" style="width:85%;" id="title" name="title" value="{if isset($gateway.title)}{text value=$gateway.title allowEmpty=true}{/if}" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="modfax_numberformat"}:</td>
@@ -38,19 +38,19 @@
 				<td width="40" rowspan="5">&nbsp;</td>
 				<td class="td1">{lng p="modfax_emailfrom"}:</td>
 				<td class="td2">
-					<input type="text" style="width:60%;" id="email_from" name="email_from" value="{text value=$prefs.from allowEmpty=true}" />
+					<input type="text" style="width:60%;" id="email_from" name="email_from" value="{if isset($prefs.from)}{text value=$prefs.from allowEmpty=true}{/if}" />
 				</td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="modfax_emailto"}:</td>
 				<td class="td2">
-					<input type="text" style="width:60%;" id="email_to" name="email_to" value="{text value=$prefs.to allowEmpty=true}" />
+					<input type="text" style="width:60%;" id="email_to" name="email_to" value="{if isset($prefs.to)}{text value=$prefs.to allowEmpty=true}{/if}" />
 				</td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="modfax_emailsubject"}:</td>
 				<td class="td2">
-					<input type="text" style="width:60%;" id="email_subject" name="email_subject" value="{text value=$prefs.subject allowEmpty=true}" />
+					<input type="text" style="width:60%;" id="email_subject" name="email_subject" value="{if isset($prefs.subject)}{text value=$prefs.subject allowEmpty=true}{/if}" />
 				</td>
 			</tr>
 			<tr>
@@ -62,7 +62,7 @@
 			<tr>
 				<td class="td1">{lng p="modfax_emailpdffile"}:</td>
 				<td class="td2">
-					<input type="text" style="width:35%;" id="email_pdffile" name="email_pdffile" value="{text value=$prefs.pdffile allowEmpty=true}" />
+					<input type="text" style="width:35%;" id="email_pdffile" name="email_pdffile" value="{if isset($prefs.pdffile)}{text value=$prefs.pdffile allowEmpty=true}{/if}" />
 				</td>
 			</tr>
 			</tbody>
@@ -72,7 +72,7 @@
 				<td width="40" rowspan="3">&nbsp;</td>
 				<td class="td1">{lng p="modfax_httpurl"}:</td>
 				<td class="td2">
-					<input type="text" style="width:60%;" id="http_url" name="http_url" value="{text value=$prefs.url allowEmpty=true}" />
+					<input type="text" style="width:60%;" id="http_url" name="http_url" value="{if isset($prefs.url)}{text value=$prefs.url allowEmpty=true}{/if}" />
 				</td>
 			</tr>
 			<tr>
@@ -84,7 +84,7 @@
 			<tr>
 				<td class="td1">{lng p="returnvalue"}:</td>
 				<td class="td2">
-					<input type="text" style="width:35%;" id="http_returnvalue" name="http_returnvalue" value="{text value=$prefs.returnvalue allowEmpty=true}" />
+					<input type="text" style="width:35%;" id="http_returnvalue" name="http_returnvalue" value="{if isset($prefs.returnvalue)}{text value=$prefs.returnvalue allowEmpty=true}{/if}" />
 				</td>
 			</tr>
 			</tbody>
@@ -110,19 +110,19 @@
 				<td width="40" rowspan="5">&nbsp;</td>
 				<td class="td1">{lng p="modfax_emailfrom"}:</td>
 				<td class="td2">
-					<input type="text" style="width:60%;" id="status_emailfrom" name="status_emailfrom" value="{text value=$status_prefs.emailfrom allowEmpty=true}" />
+					<input type="text" style="width:60%;" id="status_emailfrom" name="status_emailfrom" value="{if isset($status_prefs.emailfrom)}{text value=$status_prefs.emailfrom allowEmpty=true}{/if}" />
 				</td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="modfax_emailto"}:</td>
 				<td class="td2">
-					<input type="text" style="width:60%;" id="status_emailto" name="status_emailto" value="{text value=$status_prefs.emailto allowEmpty=true}" />
+					<input type="text" style="width:60%;" id="status_emailto" name="status_emailto" value="{if isset($status_prefs.emailto)}{text value=$status_prefs.emailto allowEmpty=true}{/if}" />
 				</td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="modfax_emailsubject"}:</td>
 				<td class="td2">
-					<input type="text" style="width:60%;" id="status_emailsubject" name="status_emailsubject" value="{text value=$status_prefs.emailsubject allowEmpty=true}" />
+					<input type="text" style="width:60%;" id="status_emailsubject" name="status_emailsubject" value="{if isset($status_prefs.emailsubject)}{text value=$status_prefs.emailsubject allowEmpty=true}{/if}" />
 				</td>
 			</tr>
 			<tr>
@@ -132,7 +132,7 @@
 						<option value="subject"{if $status_prefs.code_field=='subject'} selected="selected"{/if}>{lng p="subject"}</fieldset>
 						<option value="text"{if $status_prefs.code_field=='text'} selected="selected"{/if}>{lng p="text"}</fieldset>
 					</select>
-					<input type="text" size="32" id="status_code_regex" name="status_code_regex" value="{text value=$status_prefs.code_regex allowEmpty=true}" />
+					<input type="text" size="32" id="status_code_regex" name="status_code_regex" value="{if isset($status_prefs.code_regex)}{text value=$status_prefs.code_regex allowEmpty=true}{/if}" />
 				</td>
 			</tr>
 			<tr>
@@ -142,7 +142,7 @@
 						<option value="subject"{if $status_prefs.success_field=='subject'} selected="selected"{/if}>{lng p="subject"}</fieldset>
 						<option value="text"{if $status_prefs.success_field=='text'} selected="selected"{/if}>{lng p="text"}</fieldset>
 					</select>
-					<input type="text" size="32" id="status_success_regex" name="status_success_regex" value="{text value=$status_prefs.success_regex allowEmpty=true}" />
+					<input type="text" size="32" id="status_success_regex" name="status_success_regex" value="{if isset($status_prefs.success_regex)}{text value=$status_prefs.success_regex allowEmpty=true}{/if}" />
 				</td>
 			</tr>
 			</tbody>
@@ -152,19 +152,19 @@
 				<td width="40" rowspan="3">&nbsp;</td>
 				<td class="td1">{lng p="modfax_statuscode_param"}:</td>
 				<td class="td2">
-					<input type="text" style="width:60%;" id="status_code_param" name="status_code_param" value="{text value=$status_prefs.code_param allowEmpty=true}" />
+					<input type="text" style="width:60%;" id="status_code_param" name="status_code_param" value="{if isset($status_prefs.code_param)}{text value=$status_prefs.code_param allowEmpty=true}{/if}" />
 				</td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="modfax_result_param"}:</td>
 				<td class="td2">
-					<input type="text" style="width:60%;" id="status_result_param" name="status_result_param" value="{text value=$status_prefs.result_param allowEmpty=true}" />
+					<input type="text" style="width:60%;" id="status_result_param" name="status_result_param" value="{if isset($status_prefs.result_param)}{text value=$status_prefs.result_param allowEmpty=true}{/if}" />
 				</td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="modfax_success_from"}:</td>
 				<td class="td2">
-					<input type="text" style="width:60%;" id="status_result_regex" name="status_result_regex" value="{text value=$status_prefs.result_regex allowEmpty=true}" />
+					<input type="text" style="width:60%;" id="status_result_regex" name="status_result_regex" value="{if isset($status_prefs.result_regex)}{text value=$status_prefs.result_regex allowEmpty=true}{/if}" />
 				</td>
 			</tr>
 			</tbody>
@@ -175,11 +175,11 @@
 			<tr>
 				<td width="40" rowspan="2">&nbsp;</td>
 				<td class="td1">{lng p="user"}:</td>
-				<td class="td2"><input type="text" size="36" id="user" name="user" value="{text value=$gateway.user allowEmpty=true}" /></td>
+				<td class="td2"><input type="text" size="36" id="user" name="user" value="{if isset($gateway.user)}{text value=$gateway.user allowEmpty=true}{/if}" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="password"}:</td>
-				<td class="td2"><input type="password" autocomplete="off" size="36" id="pass" name="pass" value="{text value=$gateway.pass allowEmpty=true}" /></td>
+				<td class="td2"><input type="password" autocomplete="off" size="36" id="pass" name="pass" value="{if isset($gateway.pass)}{text value=$gateway.pass allowEmpty=true}{/if}" /></td>
 			</tr>
 		</table>
 	
diff --git a/src/plugins/templates/modfax.admin.gateways.simple.tpl b/src/plugins/templates/modfax.admin.gateways.simple.tpl
index f4ff202..d767e17 100644
--- a/src/plugins/templates/modfax.admin.gateways.simple.tpl
+++ b/src/plugins/templates/modfax.admin.gateways.simple.tpl
@@ -17,8 +17,8 @@
 			<td align="center"><img src="../plugins/templates/images/modfax_gateway.png" border="0" alt="" width="16" height="16" /></td>
 			<td>{text value=$gateway.title}</td>
 			<td>{if $gateway.protocol==1}{lng p="modfax_email"}{else}{lng p="modfax_http"}{/if}</td>
-			<td><input type="text" name="gateways[{$gateway.faxgateid}][user]" value="{text value=$gateway.user allowEmpty=true}" style="width:90%;" /></td>
-			<td><input type="password" name="gateways[{$gateway.faxgateid}][pass]" value="{text value=$gateway.pass allowEmpty=true}" style="width:90%;" /></td>
+			<td><input type="text" name="gateways[{$gateway.faxgateid}][user]" value="{if isset($gateway.user)}{text value=$gateway.user allowEmpty=true}{/if}" style="width:90%;" /></td>
+			<td><input type="password" name="gateways[{$gateway.faxgateid}][pass]" value="{if isset($gateway.pass)}{text value=$gateway.pass allowEmpty=true}{/if}" style="width:90%;" /></td>
 		</tr>
 		{/foreach}
 	</table>
diff --git a/src/plugins/templates/modfax.admin.prefixes.edit.tpl b/src/plugins/templates/modfax.admin.prefixes.edit.tpl
index 05567b8..5849b7f 100644
--- a/src/plugins/templates/modfax.admin.prefixes.edit.tpl
+++ b/src/plugins/templates/modfax.admin.prefixes.edit.tpl
@@ -6,11 +6,11 @@
 			<tr>
 				<td width="40" valign="top" rowspan="5"><img src="../plugins/templates/images/modfax_prefix.png" border="0" alt="" width="32" height="32" /></td>
 				<td class="td1" width="150">{lng p="modfax_country_prefix"}:</td>
-				<td class="td2"><input type="text" size="8" name="country_prefix" value="{text value=$prefix.country_prefix allowEmpty=true}" /></td>
+				<td class="td2"><input type="text" size="8" name="country_prefix" value="{if isset($prefix.country_prefix)}{text value=$prefix.country_prefix allowEmpty=true}{/if}" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="modfax_prefix"}:</td>
-				<td class="td2"><input type="text" size="16" name="prefix" value="{text value=$prefix.prefix allowEmpty=true}" /></td>
+				<td class="td2"><input type="text" size="16" name="prefix" value="{if isset($prefix.prefix)}{text value=$prefix.prefix allowEmpty=true}{/if}" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="gateway"}:</td>
diff --git a/src/plugins/templates/modfax.admin.prefixes.tpl b/src/plugins/templates/modfax.admin.prefixes.tpl
index 0706dfb..84cbfa1 100644
--- a/src/plugins/templates/modfax.admin.prefixes.tpl
+++ b/src/plugins/templates/modfax.admin.prefixes.tpl
@@ -57,7 +57,7 @@
 			<tr>
 				<td width="40" valign="top" rowspan="5"><img src="../plugins/templates/images/modfax_prefix.png" border="0" alt="" width="32" height="32" /></td>
 				<td class="td1" width="150">{lng p="modfax_country_prefix"}:</td>
-				<td class="td2"><input type="text" size="8" name="country_prefix" value="{text value=$faxPrefs.default_country_prefix allowEmpty=true}" /></td>
+				<td class="td2"><input type="text" size="8" name="country_prefix" value="{if isset($faxPrefs.default_country_prefix)}{text value=$faxPrefs.default_country_prefix allowEmpty=true}{/if}" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="modfax_prefix"}:</td>
diff --git a/src/plugins/templates/modfax.admin.prefs.tpl b/src/plugins/templates/modfax.admin.prefs.tpl
index f284ddc..4ed53e3 100644
--- a/src/plugins/templates/modfax.admin.prefs.tpl
+++ b/src/plugins/templates/modfax.admin.prefs.tpl
@@ -20,7 +20,7 @@
 		<table>
 			<tr>
 				<td class="td1" width="220">{lng p="modfax_country_prefix"}:</td>
-				<td class="td2"><input type="text" name="default_country_prefix" value="{text value=$faxPrefs.default_country_prefix allowEmpty=true}" size="8" /></td>
+				<td class="td2"><input type="text" name="default_country_prefix" value="{if isset($faxPrefs.default_country_prefix)}{text value=$faxPrefs.default_country_prefix allowEmpty=true}{/if}" size="8" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="defaultgateway"}:</td>
@@ -32,11 +32,11 @@
 			</tr>
 			<tr>
 				<td class="td1">{lng p="modfax_fromname"}:</td>
-				<td class="td2"><input type="text" name="default_name" value="{text value=$faxPrefs.default_name allowEmpty=true}" size="36" /></td>
+				<td class="td2"><input type="text" name="default_name" value="{if isset($faxPrefs.default_name)}{text value=$faxPrefs.default_name allowEmpty=true}{/if}" size="36" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="modfax_fromno"}:</td>
-				<td class="td2"><input type="text" name="default_no" value="{text value=$faxPrefs.default_no allowEmpty=true}" size="28" /></td>
+				<td class="td2"><input type="text" name="default_no" value="{if isset($faxPrefs.default_no)}{text value=$faxPrefs.default_no allowEmpty=true}{/if}" size="28" /></td>
 			</tr>
 		</table>
 	</fieldset>
diff --git a/src/plugins/templates/modfax.user.compose.block.tpl b/src/plugins/templates/modfax.user.compose.block.tpl
index fed9afb..6971ef0 100644
--- a/src/plugins/templates/modfax.user.compose.block.tpl
+++ b/src/plugins/templates/modfax.user.compose.block.tpl
@@ -78,7 +78,7 @@
 					</tr>
 					<tr>
 						<td><strong><label for="block_#_phone">{lng p="phone"}:</label></strong> &nbsp;</td>
-						<td><input type="text" style="width:350px;" name="block[#][cover][phone]" id="block_#_phone" value="{text value=$userRow.tel}" /></td>
+						<td><input type="text" style="width:350px;" name="block[#][cover][phone]" id="block_#_phone" value="{if isset($userRow.tel)}{text value=$userRow.tel}{/if}" /></td>
 					</tr>
 					<tr>
 						<td><strong><label>{lng p="modfax_remark"}:</label></strong> &nbsp;</td>
diff --git a/src/plugins/templates/mybbauth.plugin.prefs.tpl b/src/plugins/templates/mybbauth.plugin.prefs.tpl
index e21cf1a..83ba903 100644
--- a/src/plugins/templates/mybbauth.plugin.prefs.tpl
+++ b/src/plugins/templates/mybbauth.plugin.prefs.tpl
@@ -10,23 +10,23 @@
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="host"}:</td>
-			<td class="td2"><input type="text" name="mysqlHost" value="{text value=$mybb_prefs.mysqlHost}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlHost" value="{if isset($mybb_prefs.mysqlHost)}{text value=$mybb_prefs.mysqlHost}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="user"}:</td>
-			<td class="td2"><input type="text" name="mysqlUser" value="{text value=$mybb_prefs.mysqlUser}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlUser" value="{if isset($mybb_prefs.mysqlUser)}{text value=$mybb_prefs.mysqlUser}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="password"}:</td>
-			<td class="td2"><input type="password" name="mysqlPass" value="{text value=$mybb_prefs.mysqlPass}" size="36" /></td>
+			<td class="td2"><input type="password" name="mysqlPass" value="{if isset($mybb_prefs.mysqlPass)}{text value=$mybb_prefs.mysqlPass}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="db"}:</td>
-			<td class="td2"><input type="text" name="mysqlDB" value="{text value=$mybb_prefs.mysqlDB}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlDB" value="{if isset($mybb_prefs.mysqlDB)}{text value=$mybb_prefs.mysqlDB}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL Prefix:</td>
-			<td class="td2"><input type="text" name="mysqlPrefix" value="{text value=$mybb_prefs.mysqlPrefix allowEmpty=true}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlPrefix" value="{if isset($mybb_prefs.mysqlPrefix)}{text value=$mybb_prefs.mysqlPrefix allowEmpty=true}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">{lng p="user"}-{lng p="domain"}:</td>
diff --git a/src/plugins/templates/news.admin.edit.tpl b/src/plugins/templates/news.admin.edit.tpl
index 15519f4..34c2522 100644
--- a/src/plugins/templates/news.admin.edit.tpl
+++ b/src/plugins/templates/news.admin.edit.tpl
@@ -8,7 +8,7 @@
 			<tr>
 				<td width="40" valign="top" rowspan="6"><img src="../plugins/templates/images/news_add.png" border="0" alt="" width="32" height="32" /></td>
 				<td class="td1" width="180">{lng p="title"}:</td>
-				<td class="td2"><input type="text" style="width:85%;" name="title" id="title" value="{text value=$news.title}" /></td>
+				<td class="td2"><input type="text" style="width:85%;" name="title" id="title" value="{if isset($news.title)}{text value=$news.title}{/if}" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="type"}:</td>
diff --git a/src/plugins/templates/openfire.plugin.prefs.tpl b/src/plugins/templates/openfire.plugin.prefs.tpl
index 59188d0..0c71f24 100644
--- a/src/plugins/templates/openfire.plugin.prefs.tpl
+++ b/src/plugins/templates/openfire.plugin.prefs.tpl
@@ -11,19 +11,19 @@
 		</tr>
 		<tr>
 			<td class="td1">{lng p="openfire_domain"}:</td>
-			<td class="td2"><input type="text" name="openfire_domain" value="{text value=$openfire_prefs.domain}" size="36" /></td>
+			<td class="td2"><input type="text" name="openfire_domain" value="{if isset($openfire_prefs.domain)}{text value=$openfire_prefs.domain}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">{lng p="openfire_port"}:</td>
-			<td class="td2"><input type="text" name="openfire_port" value="{text value=$openfire_prefs.port}" size="36" /></td>
+			<td class="td2"><input type="text" name="openfire_port" value="{if isset($openfire_prefs.port)}{text value=$openfire_prefs.port}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">{lng p="openfire_https"}?</td>
-			<td class="td2"><input name="openfire_https"{if $openfire_prefs.https} checked="checked"{/if} type="checkbox" /></td>
+			<td class="td2"><input name="openfire_https"{if !empty($openfire_prefs.https)} checked="checked"{/if} type="checkbox" /></td>
 		</tr>
 		<tr>
 			<td class="td1">{lng p="openfire_secretkey"}:</td>
-			<td class="td2"><input type="text" name="openfire_userservice_secretkey" value="{text value=$openfire_prefs.secretkey}" size="36" /></td>
+			<td class="td2"><input type="text" name="openfire_userservice_secretkey" value="{if isset($openfire_prefs.secretkey)}{text value=$openfire_prefs.secretkey}{/if}" size="36" /></td>
 		</tr>
 	</table>
 	<p>
diff --git a/src/plugins/templates/pacc.admin.prefs.tpl b/src/plugins/templates/pacc.admin.prefs.tpl
index 1886f54..8adf32f 100644
--- a/src/plugins/templates/pacc.admin.prefs.tpl
+++ b/src/plugins/templates/pacc.admin.prefs.tpl
@@ -10,7 +10,7 @@
 			<tr>
 				<td class="td1">{lng p="pacc_update_notification"}:</td>
 				<td class="td2">
-					<input id="send_update_notification" name="send_update_notification"{if $pacc_prefs.send_update_notification=='yes'} checked="checked"{/if} type="checkbox" /> <input type="text" name="update_notification_days" value="{text value=$pacc_prefs.update_notification_days allowEmpty=true}" size="4" /> {lng p="pacc_before_expiration"}<br />
+					<input id="send_update_notification" name="send_update_notification"{if $pacc_prefs.send_update_notification=='yes'} checked="checked"{/if} type="checkbox" /> <input type="text" name="update_notification_days" value="{if isset($pacc_prefs.update_notification_days)}{text value=$pacc_prefs.update_notification_days allowEmpty=true}{/if}" size="4" /> {lng p="pacc_before_expiration"}<br />
 					<input id="update_notification_altmail" name="update_notification_altmail"{if $pacc_prefs.update_notification_altmail=='yes'} checked="checked"{/if} type="checkbox" />
 					<label for="update_notification_altmail">{lng p="pacc_update_notification_altmail"}</label>
 				</td>
diff --git a/src/plugins/templates/phpbb3auth.plugin.prefs.tpl b/src/plugins/templates/phpbb3auth.plugin.prefs.tpl
index 1b57be8..ddfb464 100644
--- a/src/plugins/templates/phpbb3auth.plugin.prefs.tpl
+++ b/src/plugins/templates/phpbb3auth.plugin.prefs.tpl
@@ -10,23 +10,23 @@
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="host"}:</td>
-			<td class="td2"><input type="text" name="mysqlHost" value="{text value=$phpbb3_prefs.mysqlHost}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlHost" value="{if isset($phpbb3_prefs.mysqlHost)}{text value=$phpbb3_prefs.mysqlHost}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="user"}:</td>
-			<td class="td2"><input type="text" name="mysqlUser" value="{text value=$phpbb3_prefs.mysqlUser}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlUser" value="{if isset($phpbb3_prefs.mysqlUser)}{text value=$phpbb3_prefs.mysqlUser}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="password"}:</td>
-			<td class="td2"><input type="password" name="mysqlPass" value="{text value=$phpbb3_prefs.mysqlPass}" size="36" /></td>
+			<td class="td2"><input type="password" name="mysqlPass" value="{if isset($phpbb3_prefs.mysqlPass)}{text value=$phpbb3_prefs.mysqlPass}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="db"}:</td>
-			<td class="td2"><input type="text" name="mysqlDB" value="{text value=$phpbb3_prefs.mysqlDB}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlDB" value="{if isset($phpbb3_prefs.mysqlDB)}{text value=$phpbb3_prefs.mysqlDB}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL Prefix:</td>
-			<td class="td2"><input type="text" name="mysqlPrefix" value="{text value=$phpbb3_prefs.mysqlPrefix allowEmpty=true}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlPrefix" value="{if isset($phpbb3_prefs.mysqlPrefix)}{text value=$phpbb3_prefs.mysqlPrefix allowEmpty=true}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">{lng p="user"}-{lng p="domain"}:</td>
diff --git a/src/plugins/templates/vbauth.plugin.prefs.tpl b/src/plugins/templates/vbauth.plugin.prefs.tpl
index 7664569..380df3f 100644
--- a/src/plugins/templates/vbauth.plugin.prefs.tpl
+++ b/src/plugins/templates/vbauth.plugin.prefs.tpl
@@ -10,23 +10,23 @@
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="host"}:</td>
-			<td class="td2"><input type="text" name="mysqlHost" value="{text value=$vb_prefs.mysqlHost}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlHost" value="{if isset($vb_prefs.mysqlHost)}{text value=$vb_prefs.mysqlHost}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="user"}:</td>
-			<td class="td2"><input type="text" name="mysqlUser" value="{text value=$vb_prefs.mysqlUser}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlUser" value="{if isset($vb_prefs.mysqlUser)}{text value=$vb_prefs.mysqlUser}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="password"}:</td>
-			<td class="td2"><input type="password" name="mysqlPass" value="{text value=$vb_prefs.mysqlPass}" size="36" /></td>
+			<td class="td2"><input type="password" name="mysqlPass" value="{if isset($vb_prefs.mysqlPass)}{text value=$vb_prefs.mysqlPass}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="db"}:</td>
-			<td class="td2"><input type="text" name="mysqlDB" value="{text value=$vb_prefs.mysqlDB}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlDB" value="{if isset($vb_prefs.mysqlDB)}{text value=$vb_prefs.mysqlDB}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL Prefix:</td>
-			<td class="td2"><input type="text" name="mysqlPrefix" value="{text value=$vb_prefs.mysqlPrefix allowEmpty=true}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlPrefix" value="{if isset($vb_prefs.mysqlPrefix)}{text value=$vb_prefs.mysqlPrefix allowEmpty=true}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">{lng p="user"}-{lng p="domain"}:</td>
diff --git a/src/plugins/templates/wbb2auth.plugin.prefs.tpl b/src/plugins/templates/wbb2auth.plugin.prefs.tpl
index 5e286d8..6c3ee04 100644
--- a/src/plugins/templates/wbb2auth.plugin.prefs.tpl
+++ b/src/plugins/templates/wbb2auth.plugin.prefs.tpl
@@ -10,23 +10,23 @@
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="host"}:</td>
-			<td class="td2"><input type="text" name="mysqlHost" value="{text value=$wbb2_prefs.mysqlHost}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlHost" value="{if isset($wbb2_prefs.mysqlHost)}{text value=$wbb2_prefs.mysqlHost}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="user"}:</td>
-			<td class="td2"><input type="text" name="mysqlUser" value="{text value=$wbb2_prefs.mysqlUser}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlUser" value="{if isset($wbb2_prefs.mysqlUser)}{text value=$wbb2_prefs.mysqlUser}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="password"}:</td>
-			<td class="td2"><input type="password" name="mysqlPass" value="{text value=$wbb2_prefs.mysqlPass}" size="36" /></td>
+			<td class="td2"><input type="password" name="mysqlPass" value="{if isset($wbb2_prefs.mysqlPass)}{text value=$wbb2_prefs.mysqlPass}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="db"}:</td>
-			<td class="td2"><input type="text" name="mysqlDB" value="{text value=$wbb2_prefs.mysqlDB}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlDB" value="{if isset($wbb2_prefs.mysqlDB)}{text value=$wbb2_prefs.mysqlDB}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL Prefix:</td>
-			<td class="td2"><input type="text" name="mysqlPrefix" value="{text value=$wbb2_prefs.mysqlPrefix allowEmpty=true}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlPrefix" value="{if isset($wbb2_prefs.mysqlPrefix)}{text value=$wbb2_prefs.mysqlPrefix allowEmpty=true}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">{lng p="user"}-{lng p="domain"}:</td>
diff --git a/src/plugins/templates/wbb3auth.plugin.prefs.tpl b/src/plugins/templates/wbb3auth.plugin.prefs.tpl
index bbc8f9c..f365466 100644
--- a/src/plugins/templates/wbb3auth.plugin.prefs.tpl
+++ b/src/plugins/templates/wbb3auth.plugin.prefs.tpl
@@ -10,23 +10,23 @@
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="host"}:</td>
-			<td class="td2"><input type="text" name="mysqlHost" value="{text value=$wbb3_prefs.mysqlHost}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlHost" value="{if isset($wbb3_prefs.mysqlHost)}{text value=$wbb3_prefs.mysqlHost}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="user"}:</td>
-			<td class="td2"><input type="text" name="mysqlUser" value="{text value=$wbb3_prefs.mysqlUser}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlUser" value="{if isset($wbb3_prefs.mysqlUser)}{text value=$wbb3_prefs.mysqlUser}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="password"}:</td>
-			<td class="td2"><input type="password" name="mysqlPass" value="{text value=$wbb3_prefs.mysqlPass}" size="36" /></td>
+			<td class="td2"><input type="password" name="mysqlPass" value="{if isset($wbb3_prefs.mysqlPass)}{text value=$wbb3_prefs.mysqlPass}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL {lng p="db"}:</td>
-			<td class="td2"><input type="text" name="mysqlDB" value="{text value=$wbb3_prefs.mysqlDB}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlDB" value="{if isset($wbb3_prefs.mysqlDB)}{text value=$wbb3_prefs.mysqlDB}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">MySQL Prefix:</td>
-			<td class="td2"><input type="text" name="mysqlPrefix" value="{text value=$wbb3_prefs.mysqlPrefix allowEmpty=true}" size="36" /></td>
+			<td class="td2"><input type="text" name="mysqlPrefix" value="{if isset($wbb3_prefs.mysqlPrefix)}{text value=$wbb3_prefs.mysqlPrefix allowEmpty=true}{/if}" size="36" /></td>
 		</tr>
 		<tr>
 			<td class="td1">{lng p="user"}-{lng p="domain"}:</td>
diff --git a/src/templates/modern/li/email.compose.tpl b/src/templates/modern/li/email.compose.tpl
index 94467ee..0152e7b 100644
--- a/src/templates/modern/li/email.compose.tpl
+++ b/src/templates/modern/li/email.compose.tpl
@@ -96,7 +96,7 @@
 			<tr>
 				<th>{lng p="attachments"}:</th>
 				<td>
-					<input type="hidden" name="attachments" value="{text value=$mail.attachments allowEmpty=true}" id="attachments" />
+					<input type="hidden" name="attachments" value="{if isset($mail.attachments)}{text value=$mail.attachments allowEmpty=true}{/if}" id="attachments" />
 					<div id="attachmentList"></div>
 				</td>
 				<td valign="top">
diff --git a/src/templates/modern/li/email.folders.conditions.tpl b/src/templates/modern/li/email.folders.conditions.tpl
index f173e79..e59fa87 100644
--- a/src/templates/modern/li/email.folders.conditions.tpl
+++ b/src/templates/modern/li/email.folders.conditions.tpl
@@ -53,7 +53,7 @@
 				<option value="5" {if $condition.op==5}selected="selected" {/if}>{lng p="startswith"}</option>
 				<option value="6" {if $condition.op==6}selected="selected" {/if}>{lng p="endswith"}</option>
 			</select>
-			<input type="text" size="20" name="text_val_{$condition.id}" value="{text value=$condition.val allowEmpty=true}" />
+			<input type="text" size="20" name="text_val_{$condition.id}" value="{if isset($condition.val)}{text value=$condition.val allowEmpty=true}{/if}" />
 		</span>
 		
 		<span id="boolComparison_{$condition.id}" style="display:none;">
diff --git a/src/templates/modern/li/email.folders.edit.tpl b/src/templates/modern/li/email.folders.edit.tpl
index 65c3f34..3d3da57 100644
--- a/src/templates/modern/li/email.folders.edit.tpl
+++ b/src/templates/modern/li/email.folders.edit.tpl
@@ -14,7 +14,7 @@
 		<tr>
 			<td class="listTableLeft">* <label for="titel">{lng p="title"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" name="titel" id="titel" value="{text value=$folder.titel allowEmpty=true}" style="width:100%;" />
+				<input type="text" name="titel" id="titel" value="{if isset($folder.titel)}{text value=$folder.titel allowEmpty=true}{/if}" style="width:100%;" />
 			</td>
 		</tr>
 		<tr>
diff --git a/src/templates/modern/li/email.folders.editsys.tpl b/src/templates/modern/li/email.folders.editsys.tpl
index 943c94c..8618056 100644
--- a/src/templates/modern/li/email.folders.editsys.tpl
+++ b/src/templates/modern/li/email.folders.editsys.tpl
@@ -13,7 +13,7 @@
 		<tr>
 			<td class="listTableLeft">* <label for="titel">{lng p="title"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" value="{text value=$folderTitle allowEmpty=true}" style="width:100%;" disabled="disabled" />
+				<input type="text" value="{if isset($folderTitle)}{text value=$folderTitle allowEmpty=true}{/if}" style="width:100%;" disabled="disabled" />
 			</td>
 		</tr>
 		<tr>
diff --git a/src/templates/modern/li/error.tpl b/src/templates/modern/li/error.tpl
index 8b9a59a..3e46b54 100644
--- a/src/templates/modern/li/error.tpl
+++ b/src/templates/modern/li/error.tpl
@@ -6,8 +6,8 @@
 			<b>{lng p="error"}</b>
 			<br />{$msg}
 			<br /><br />
-			<input type="button" value="&laquo; {lng p="back"}" onclick="{if !$backLink}history.back(){else}document.location.href='{$backLink}'{/if};" />
-			{if $otherButton}<input type="button" value="{text value=$otherButton.caption}" onclick="document.location.href='{$otherButton.href}';" />{/if}
+			<input type="button" value="&laquo; {lng p="back"}" onclick="{if empty($backLink)}history.back(){else}document.location.href='{$backLink}'{/if};" />
+			{if !empty($otherButton)}<input type="button" value="{text value=$otherButton.caption}" onclick="document.location.href='{$otherButton.href}';" />{/if}
 		</td>
 	</tr>
 </table>
\ No newline at end of file
diff --git a/src/templates/modern/li/organizer.addressbook.importcsv.tpl b/src/templates/modern/li/organizer.addressbook.importcsv.tpl
index 103b4b4..38fe430 100644
--- a/src/templates/modern/li/organizer.addressbook.importcsv.tpl
+++ b/src/templates/modern/li/organizer.addressbook.importcsv.tpl
@@ -8,7 +8,7 @@
 <div class="scrollContainer"><div class="pad">
 
 <form name="f1" method="post" action="organizer.addressbook.php?action=importCSV&sid={$sid}" onsubmit="return(checkNoteForm(this));">
-<input type="hidden" name="encoding" value="{text value=$encoding allowEmpty=true}" />
+<input type="hidden" name="encoding" value="{if isset($encoding)}{text value=$encoding allowEmpty=true}{/if}" />
 <input type="hidden" name="tempID" value="{$tempID}" />
 	<table class="listTable">
 		<tr>
diff --git a/src/templates/modern/li/organizer.calendar.edit.tpl b/src/templates/modern/li/organizer.calendar.edit.tpl
index 8152425..fba2c1a 100644
--- a/src/templates/modern/li/organizer.calendar.edit.tpl
+++ b/src/templates/modern/li/organizer.calendar.edit.tpl
@@ -20,13 +20,13 @@
 		<tr>
 			<td class="listTableLeft">* <label for="title">{lng p="title"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" name="title" id="title" value="{text value=$eDate.title allowEmpty=true}" size="34" style="width:100%;" />
+				<input type="text" name="title" id="title" value="{if isset($eDate.title)}{text value=$eDate.title allowEmpty=true}{/if}" size="34" style="width:100%;" />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="location">{lng p="location"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" name="location" id="location" value="{text value=$eDate.location allowEmpty=true}" size="34" style="width:60%;" />
+				<input type="text" name="location" id="location" value="{if isset($eDate.location)}{text value=$eDate.location allowEmpty=true}{/if}" size="34" style="width:60%;" />
 			</td>
 		</tr>
 		<tr>
@@ -239,7 +239,7 @@
 		<tr>
 			<td class="listTableLeft">{lng p="attendees"}:</td>
 			<td class="listTableRight">
-				<input type="hidden" name="attendees" value="{text value=$attendees allowEmpty=true}" id="attendees" />
+				<input type="hidden" name="attendees" value="{if isset($attendees)}{text value=$attendees allowEmpty=true}{/if}" id="attendees" />
 				<div id="attendeeList"></div>
 				<div>
 					<a href="javascript:addAttendee('{$sid}')"><i class="fa fa-calendar-plus-o" aria-hidden="true"></i> {lng p="add"}</a>
diff --git a/src/templates/modern/li/organizer.calendar.groups.edit.tpl b/src/templates/modern/li/organizer.calendar.groups.edit.tpl
index acd7c30..d117ba9 100644
--- a/src/templates/modern/li/organizer.calendar.groups.edit.tpl
+++ b/src/templates/modern/li/organizer.calendar.groups.edit.tpl
@@ -16,7 +16,7 @@
 		<tr>
 			<td class="listTableLeft">* <label for="title">{lng p="title"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" name="title" id="title" value="{text value=$group.title allowEmpty=true}" size="34" style="width:100%;" />
+				<input type="text" name="title" id="title" value="{if isset($group.title)}{text value=$group.title allowEmpty=true}{/if}" size="34" style="width:100%;" />
 			</td>
 		</tr>
 		<tr>
diff --git a/src/templates/modern/li/organizer.customize.tpl b/src/templates/modern/li/organizer.customize.tpl
index 6630068..fd10ca3 100644
--- a/src/templates/modern/li/organizer.customize.tpl
+++ b/src/templates/modern/li/organizer.customize.tpl
@@ -14,9 +14,9 @@
 			
 			{foreach from=$possibleWidgets key=widget item=info}
 			<tr>
-				<td class="listTableLeft"><input type="checkbox" id="widget_{$widget}" name="widget_{$widget}"{if $info.active} checked="checked"{/if} /></td>
+				<td class="listTableLeft"><input type="checkbox" id="widget_{$widget}" name="widget_{$widget}"{if !empty($info.active)} checked="checked"{/if} /></td>
 				<td class="listTableRight">
-					<label for="widget_{$widget}">{if $info.icon}<img src="{$info.icon}" border="0" alt="" width="16" height="16" /> {/if}{$info.title}</label>
+					<label for="widget_{$widget}">{if !empty($info.icon)}<img src="{$info.icon}" border="0" alt="" width="16" height="16" /> {/if}{$info.title}</label>
 				</td>
 			</tr>
 			{/foreach}
diff --git a/src/templates/modern/li/organizer.todo.edit.tpl b/src/templates/modern/li/organizer.todo.edit.tpl
index 60e8bf7..86f2733 100644
--- a/src/templates/modern/li/organizer.todo.edit.tpl
+++ b/src/templates/modern/li/organizer.todo.edit.tpl
@@ -24,7 +24,7 @@
 		<tr>
 			<td class="listTableLeft">* <label for="titel">{lng p="title"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" name="titel" id="titel" value="{text value=$task.titel allowEmpty=true}" style="width:100%;" />
+				<input type="text" name="titel" id="titel" value="{if isset($task.titel)}{text value=$task.titel allowEmpty=true}{/if}" style="width:100%;" />
 			</td>
 		</tr>
 		<tr>
diff --git a/src/templates/modern/li/payment.pay.tpl b/src/templates/modern/li/payment.pay.tpl
index d2e616f..b7c0515 100644
--- a/src/templates/modern/li/payment.pay.tpl
+++ b/src/templates/modern/li/payment.pay.tpl
@@ -71,7 +71,7 @@
 			<p><center>
 				<form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="ppForm">
 					<input type="hidden" name="cmd" value="_xclick" />
-					<input type="hidden" name="business" value="{text value=$_pf.payPalMail}" />
+					<input type="hidden" name="business" value="{if isset($_pf.payPalMail)}{text value=$_pf.payPalMail}{/if}" />
 					<input type="hidden" name="item_name" value="{$_pf.itemName}" />
 					<input type="hidden" name="item_number" value="{$_pf.invoiceNo}" />
 					<input type="hidden" name="invoice" value="{$_pf.orderID}" />
@@ -100,7 +100,7 @@
 				<input type="hidden" name="transaction_id" value="{$_pf.orderID}" />
 				<input type="hidden" name="return_url" value="{$_pf.returnURL}" />
 				<input type="hidden" name="cancel_url" value="{$_pf.returnURL}" />
-				<input type="hidden" name="pay_to_email" value="{text value=$_pf.skrillMail}" />
+				<input type="hidden" name="pay_to_email" value="{if isset($_pf.skrillMail)}{text value=$_pf.skrillMail}{/if}" />
 				<input type="hidden" name="status_url" value="{$_pf.notifyURL}" />
 				<input type="hidden" name="language" value="{lng p="langCode"}" />
 				<input type="hidden" name="amount" value="{$_pf.amountEN}" />
diff --git a/src/templates/modern/li/prefs.aliases.edit.tpl b/src/templates/modern/li/prefs.aliases.edit.tpl
index 9d88aeb..8a7db6d 100644
--- a/src/templates/modern/li/prefs.aliases.edit.tpl
+++ b/src/templates/modern/li/prefs.aliases.edit.tpl
@@ -8,7 +8,7 @@
 <div class="scrollContainer"><div class="pad">
 
 <form name="f1" method="post" action="prefs.php?action=aliases&do=update&sid={$sid}">
-	<input type="hidden" name="id" value="{text value=$alias.id}" />
+	<input type="hidden" name="id" value="{if isset($alias.id)}{text value=$alias.id}{/if}" />
 	<table class="listTable">
 		<tr>
 			<th class="listTableHead" colspan="2"> {lng p="editalias"}</th>
@@ -18,13 +18,13 @@
 		<tr>
 			<td class="listTableLeft"><label for="email_name">{lng p="sendername"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" name="email_name" id="email_name" value="{text value=$alias.sendername allowEmpty=true}" size="34"  />
+				<input type="text" name="email_name" id="email_name" value="{if isset($alias.sendername)}{text value=$alias.sendername allowEmpty=true}{/if}" size="34"  />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft">* <label for="email">{lng p="email"}:</label></td>
 			<td class="listTableRight">
-				<input type="email" name="email" id="email" value="{text value=$alias.email}" size="34" disabled /><br />
+				<input type="email" name="email" id="email" value="{if isset($alias.email)}{text value=$alias.email}{/if}" size="34" disabled /><br />
 			</td>
 		</tr>
 		<tr>
diff --git a/src/templates/modern/li/prefs.common.tpl b/src/templates/modern/li/prefs.common.tpl
index c2c69dd..980ac22 100644
--- a/src/templates/modern/li/prefs.common.tpl
+++ b/src/templates/modern/li/prefs.common.tpl
@@ -43,7 +43,7 @@
 		<tr>
 			<td class="listTableLeft"><label for="datumsformat">{lng p="dateformat"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" name="datumsformat" id="datumsformat" value="{text value=$datumsformat}" style="width:250px;" />
+				<input type="text" name="datumsformat" id="datumsformat" value="{if isset($datumsformat)}{text value=$datumsformat}{/if}" style="width:250px;" />
 			</td>
 		</tr>
 		<tr>
@@ -145,7 +145,7 @@
 		<tr>
 			<td class="listTableLeft"><label for="absendername">{lng p="sendername"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" name="absendername" id="absendername" value="{text value=$absendername allowEmpty=true}" style="width:350px;" />
+				<input type="text" name="absendername" id="absendername" value="{if isset($absendername)}{text value=$absendername allowEmpty=true}{/if}" style="width:350px;" />
 			</td>
 		</tr>
 		<tr>
diff --git a/src/templates/modern/li/prefs.extpop3.edit.tpl b/src/templates/modern/li/prefs.extpop3.edit.tpl
index f7ede7b..e470530 100644
--- a/src/templates/modern/li/prefs.extpop3.edit.tpl
+++ b/src/templates/modern/li/prefs.extpop3.edit.tpl
@@ -21,7 +21,7 @@
 		<tr>
 			<td class="listTableLeft">* <label for="p_host">{lng p="pop3server"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" name="p_host" id="p_host" value="{text value=$account.p_host allowEmpty=true}" size="48" />
+				<input type="text" name="p_host" id="p_host" value="{if isset($account.p_host)}{text value=$account.p_host allowEmpty=true}{/if}" size="48" />
 			</td>
 		</tr>
 		<tr>
@@ -35,13 +35,13 @@
 		<tr>
 			<td class="listTableLeft">* <label for="p_user">{lng p="username"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" name="p_user" id="p_user" value="{text value=$account.p_user allowEmpty=true}" size="48" />
+				<input type="text" name="p_user" id="p_user" value="{if isset($account.p_user)}{text value=$account.p_user allowEmpty=true}{/if}" size="48" />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft">* <label for="p_pass">{lng p="password"}:</label></td>
 			<td class="listTableRight">
-				<input type="password" name="p_pass" id="p_pass" value="{text value=$account.p_pass allowEmpty=true}" size="24" />
+				<input type="password" name="p_pass" id="p_pass" value="{if isset($account.p_pass)}{text value=$account.p_pass allowEmpty=true}{/if}" size="24" />
 			</td>
 		</tr>
 		<tr>
diff --git a/src/templates/modern/li/prefs.filters.edit.tpl b/src/templates/modern/li/prefs.filters.edit.tpl
index c310994..0339f6a 100644
--- a/src/templates/modern/li/prefs.filters.edit.tpl
+++ b/src/templates/modern/li/prefs.filters.edit.tpl
@@ -14,7 +14,7 @@
 		<tr>
 			<td class="listTableLeft">* <label for="titel">{lng p="title"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" name="title" id="titel" value="{text value=$filter.title}" style="width:100%;" />
+				<input type="text" name="title" id="titel" value="{if isset($filter.title)}{text value=$filter.title}{/if}" style="width:100%;" />
 			</td>
 		</tr>
 		<tr>
diff --git a/src/templates/modern/li/prefs.keyring.issuecert.step2.tpl b/src/templates/modern/li/prefs.keyring.issuecert.step2.tpl
index 395ce9f..e9c371f 100644
--- a/src/templates/modern/li/prefs.keyring.issuecert.step2.tpl
+++ b/src/templates/modern/li/prefs.keyring.issuecert.step2.tpl
@@ -9,7 +9,7 @@
 
 <form name="f1" method="post" action="prefs.php?action=keyring&do=issuePrivateCertificate&sid={$sid}">
 	<input type="hidden" name="step" value="3" />
-	<input type="hidden" name="address" value="{text value=$address}" />
+	<input type="hidden" name="address" value="{if isset($address)}{text value=$address}{/if}" />
 
 	<table class="listTable">
 		<tr>
diff --git a/src/templates/modern/li/search.sidebar.tpl b/src/templates/modern/li/search.sidebar.tpl
index 9a6e99a..131a50b 100644
--- a/src/templates/modern/li/search.sidebar.tpl
+++ b/src/templates/modern/li/search.sidebar.tpl
@@ -9,7 +9,7 @@
 	<table>
 		<tr>
 			<td width="16"><i class="fa fa-search" aria-hidden="true"></i></td>
-			<td><input type="text" name="q" id="q" style="width: 150px;" value="{text value=$q allowEmpty=true}" /></td>
+			<td><input type="text" name="q" id="q" style="width: 150px;" value="{if isset($q)}{text value=$q allowEmpty=true}{/if}" /></td>
 		</tr>
 	</table>
 </center>
diff --git a/src/templates/modern/li/webdisk.dialog.tpl b/src/templates/modern/li/webdisk.dialog.tpl
index 28916bc..5486761 100644
--- a/src/templates/modern/li/webdisk.dialog.tpl
+++ b/src/templates/modern/li/webdisk.dialog.tpl
@@ -26,7 +26,7 @@
 		{if $type=='save'}
 		<tr>
 			<td colspan="2" class="saveAs">
-				{lng p="saveas"}: <input type="text" name="filename" id="filename" value="{text value=$filename allowEmpty=true}" size="30" />
+				{lng p="saveas"}: <input type="text" name="filename" id="filename" value="{if isset($filename)}{text value=$filename allowEmpty=true}{/if}" size="30" />
 			</td>
 		</tr>
 		{else}
diff --git a/src/templates/modern/li/webdisk.folder.tpl b/src/templates/modern/li/webdisk.folder.tpl
index a9aba07..fcd41bb 100644
--- a/src/templates/modern/li/webdisk.folder.tpl
+++ b/src/templates/modern/li/webdisk.folder.tpl
@@ -14,8 +14,8 @@
 	
 	{if $isShared}
 	<form action="email.compose.php?sid={$sid}" method="post" name="mailForm">
-		<input type="hidden" name="subject" value="{text value=$shareMailSubject allowEmpty=true}" />
-		<textarea name="text" style="display:none">{text value=$shareMail allowEmpty=true}</textarea>
+		<input type="hidden" name="subject" value="{if isset($shareMailSubject)}{text value=$shareMailSubject allowEmpty=true}{/if}" />
+		<textarea name="text" style="display:none">{if isset($shareMail)}{text value=$shareMail allowEmpty=true}{/if}</textarea>
 	</form>
 	{/if}
 	
diff --git a/src/templates/modern/li/webdisk.share.tpl b/src/templates/modern/li/webdisk.share.tpl
index aa960b8..eb6bc00 100644
--- a/src/templates/modern/li/webdisk.share.tpl
+++ b/src/templates/modern/li/webdisk.share.tpl
@@ -21,7 +21,7 @@
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="password">{lng p="password"}:</label></td>
-			<td class="listTableRight"><input type="password" id="password" name="sharePW" value="{text value=$folderPW allowEmpty=true}" size="30" /></td>
+			<td class="listTableRight"><input type="password" id="password" name="sharePW" value="{if isset($folderPW)}{text value=$folderPW allowEmpty=true}{/if}" size="30" /></td>
 		</tr>
 		<tr>
 			<td class="listTableLeft">&nbsp;</td>
diff --git a/src/templates/modern/m/compose.tpl b/src/templates/modern/m/compose.tpl
index ede4a83..eb768da 100644
--- a/src/templates/modern/m/compose.tpl
+++ b/src/templates/modern/m/compose.tpl
@@ -21,17 +21,17 @@
 		
 		<div data-role="fieldcontain">
 			<label for="to">{lng p="to"}:</label>
-			<input type="text" name="to" id="to" value="{text value=$mail.to allowEmpty=true}"  />
+			<input type="text" name="to" id="to" value="{if isset($mail.to)}{text value=$mail.to allowEmpty=true}{/if}"  />
 		</div>
 		
 		<div data-role="fieldcontain">
 			<label for="cc">{lng p="cc"}:</label>
-			<input type="text" name="cc" id="cc" value="{text value=$mail.cc allowEmpty=true}"  />
+			<input type="text" name="cc" id="cc" value="{if isset($mail.cc)}{text value=$mail.cc allowEmpty=true}{/if}"  />
 		</div>
 		
 		<div data-role="fieldcontain">
 			<label for="subject">{lng p="subject"}:</label>
-			<input type="text" name="subject" id="subject" value="{text value=$mail.subject allowEmpty=true}"  />
+			<input type="text" name="subject" id="subject" value="{if isset($mail.subject)}{text value=$mail.subject allowEmpty=true}{/if}"  />
 		</div>
 		
 		<textarea name="text" style="min-height:200px;">{$mail.text}</textarea>
diff --git a/src/templates/modern/m/tasks.edit.tpl b/src/templates/modern/m/tasks.edit.tpl
index 9b9b681..5f6359b 100644
--- a/src/templates/modern/m/tasks.edit.tpl
+++ b/src/templates/modern/m/tasks.edit.tpl
@@ -8,7 +8,7 @@
 	<form id="taskForm" action="tasks.php?do=save&id={$task.id}&list={$task.tasklistid}&sid={$sid}" method="post">
 		<div data-role="fieldcontain">
 			<label for="title">{lng p="title"}:</label>
-			<input type="text" name="titel" id="title" value="{text value=$task.titel allowEmpty=true}"  />
+			<input type="text" name="titel" id="title" value="{if isset($task.titel)}{text value=$task.titel allowEmpty=true}{/if}"  />
 		</div>
 
 		<div data-role="fieldcontain">
diff --git a/src/templates/modern/nli/contact.complete.tpl b/src/templates/modern/nli/contact.complete.tpl
index 045b8ff..95dbff8 100644
--- a/src/templates/modern/nli/contact.complete.tpl
+++ b/src/templates/modern/nli/contact.complete.tpl
@@ -35,7 +35,7 @@
 							<label class="control-label" for="vorname">
 								{lng p="firstname"}
 							</label>
-							<input type="text" class="form-control" id="vorname" name="vorname" value="{text value=$contact.vorname allowEmpty=true}" disabled="disabled" />
+							<input type="text" class="form-control" id="vorname" name="vorname" value="{if isset($contact.vorname)}{text value=$contact.vorname allowEmpty=true}{/if}" disabled="disabled" />
 						</div>
 					</div>
 					<div class="col-md-6">
@@ -43,7 +43,7 @@
 							<label class="control-label" for="nachname">
 								{lng p="surname"}
 							</label>
-							<input type="text" class="form-control" id="nachname" name="nachname" value="{text value=$contact.nachname allowEmpty=true}" disabled="disabled" />
+							<input type="text" class="form-control" id="nachname" name="nachname" value="{if isset($contact.nachname)}{text value=$contact.nachname allowEmpty=true}{/if}" disabled="disabled" />
 						</div>
 					</div>
 				</div>
@@ -62,7 +62,7 @@
 							<label class="control-label" for="strassenr">
 								{lng p="streetnr"}
 							</label>
-							<input type="text" class="form-control" id="strassenr" name="strassenr" value="{text value=$contact.strassenr allowEmpty=true}" />
+							<input type="text" class="form-control" id="strassenr" name="strassenr" value="{if isset($contact.strassenr)}{text value=$contact.strassenr allowEmpty=true}{/if}" />
 						</div>
 					</div>
 				</div>
@@ -72,7 +72,7 @@
 							<label class="control-label" for="plz">
 								{lng p="zip"}
 							</label>
-							<input type="text" class="form-control" id="plz" name="plz" value="{text value=$contact.plz allowEmpty=true}" />
+							<input type="text" class="form-control" id="plz" name="plz" value="{if isset($contact.plz)}{text value=$contact.plz allowEmpty=true}{/if}" />
 						</div>
 					</div>
 					<div class="col-md-8">
@@ -80,7 +80,7 @@
 							<label class="control-label" for="ort">
 								{lng p="city"}
 							</label>
-							<input type="text" class="form-control" id="ort" name="ort" value="{text value=$contact.ort allowEmpty=true}" />
+							<input type="text" class="form-control" id="ort" name="ort" value="{if isset($contact.ort)}{text value=$contact.ort allowEmpty=true}{/if}" />
 						</div>
 					</div>
 				</div>
@@ -90,7 +90,7 @@
 							<label class="control-label" for="land">
 								{lng p="country"}
 							</label>
-							<input type="text" class="form-control" id="land" name="land" value="{text value=$contact.land allowEmpty=true}" />
+							<input type="text" class="form-control" id="land" name="land" value="{if isset($contact.land)}{text value=$contact.land allowEmpty=true}{/if}" />
 						</div>
 					</div>
 				</div>
@@ -100,7 +100,7 @@
 							<label class="control-label" for="email">
 								{lng p="email"}
 							</label>
-							<input type="text" class="form-control" id="email" name="email" value="{text value=$contact.email allowEmpty=true}" />
+							<input type="text" class="form-control" id="email" name="email" value="{if isset($contact.email)}{text value=$contact.email allowEmpty=true}{/if}" />
 						</div>
 					</div>
 				</div>
@@ -110,7 +110,7 @@
 							<label class="control-label" for="tel">
 								{lng p="phone"}
 							</label>
-							<input type="text" class="form-control" id="tel" name="tel" value="{text value=$contact.tel allowEmpty=true}" />
+							<input type="text" class="form-control" id="tel" name="tel" value="{if isset($contact.tel)}{text value=$contact.tel allowEmpty=true}{/if}" />
 						</div>
 					</div>
 					<div class="col-md-6">
@@ -118,7 +118,7 @@
 							<label class="control-label" for="fax">
 								{lng p="fax"}
 							</label>
-							<input type="text" class="form-control" id="fax" name="fax" value="{text value=$contact.fax allowEmpty=true}" />
+							<input type="text" class="form-control" id="fax" name="fax" value="{if isset($contact.fax)}{text value=$contact.fax allowEmpty=true}{/if}" />
 						</div>
 					</div>
 				</div>
@@ -128,7 +128,7 @@
 							<label class="control-label" for="handy">
 								{lng p="mobile"}
 							</label>
-							<input type="text" class="form-control" id="handy" name="handy" value="{text value=$contact.handy allowEmpty=true}" />
+							<input type="text" class="form-control" id="handy" name="handy" value="{if isset($contact.handy)}{text value=$contact.handy allowEmpty=true}{/if}" />
 						</div>
 					</div>
 					<div class="col-md-6">
@@ -150,7 +150,7 @@
 							<label class="control-label" for="work_strassenr">
 								{lng p="streetnr"}
 							</label>
-							<input type="text" class="form-control" id="work_strassenr" name="work_strassenr" value="{text value=$contact.work_strassenr allowEmpty=true}" />
+							<input type="text" class="form-control" id="work_strassenr" name="work_strassenr" value="{if isset($contact.work_strassenr)}{text value=$contact.work_strassenr allowEmpty=true}{/if}" />
 						</div>
 					</div>
 				</div>
@@ -160,7 +160,7 @@
 							<label class="control-label" for="work_plz">
 								{lng p="zip"}
 							</label>
-							<input type="text" class="form-control" id="work_plz" name="work_plz" value="{text value=$contact.work_plz allowEmpty=true}" />
+							<input type="text" class="form-control" id="work_plz" name="work_plz" value="{if isset($contact.work_plz)}{text value=$contact.work_plz allowEmpty=true}{/if}" />
 						</div>
 					</div>
 					<div class="col-md-8">
@@ -168,7 +168,7 @@
 							<label class="control-label" for="work_ort">
 								{lng p="city"}
 							</label>
-							<input type="text" class="form-control" id="work_ort" name="work_ort" value="{text value=$contact.work_ort allowEmpty=true}" />
+							<input type="text" class="form-control" id="work_ort" name="work_ort" value="{if isset($contact.work_ort)}{text value=$contact.work_ort allowEmpty=true}{/if}" />
 						</div>
 					</div>
 				</div>
@@ -178,7 +178,7 @@
 							<label class="control-label" for="work_land">
 								{lng p="country"}
 							</label>
-							<input type="text" class="form-control" id="work_land" name="work_land" value="{text value=$contact.work_land allowEmpty=true}" />
+							<input type="text" class="form-control" id="work_land" name="work_land" value="{if isset($contact.work_land)}{text value=$contact.work_land allowEmpty=true}{/if}" />
 						</div>
 					</div>
 				</div>
@@ -188,7 +188,7 @@
 							<label class="control-label" for="work_email">
 								{lng p="email"}
 							</label>
-							<input type="text" class="form-control" id="work_email" name="work_email" value="{text value=$contact.work_email allowEmpty=true}" />
+							<input type="text" class="form-control" id="work_email" name="work_email" value="{if isset($contact.work_email)}{text value=$contact.work_email allowEmpty=true}{/if}" />
 						</div>
 					</div>
 				</div>
@@ -198,7 +198,7 @@
 							<label class="control-label" for="work_tel">
 								{lng p="phone"}
 							</label>
-							<input type="text" class="form-control" id="work_tel" name="work_tel" value="{text value=$contact.work_tel allowEmpty=true}" />
+							<input type="text" class="form-control" id="work_tel" name="work_tel" value="{if isset($contact.work_tel)}{text value=$contact.work_tel allowEmpty=true}{/if}" />
 						</div>
 					</div>
 					<div class="col-md-6">
@@ -206,7 +206,7 @@
 							<label class="control-label" for="work_fax">
 								{lng p="fax"}
 							</label>
-							<input type="text" class="form-control" id="work_fax" name="work_fax" value="{text value=$contact.work_fax allowEmpty=true}" />
+							<input type="text" class="form-control" id="work_fax" name="work_fax" value="{if isset($contact.work_fax)}{text value=$contact.work_fax allowEmpty=true}{/if}" />
 						</div>
 					</div>
 				</div>
@@ -216,7 +216,7 @@
 							<label class="control-label" for="work_handy">
 								{lng p="mobile"}
 							</label>
-							<input type="text" class="form-control" id="work_handy" name="work_handy" value="{text value=$contact.work_handy allowEmpty=true}" />
+							<input type="text" class="form-control" id="work_handy" name="work_handy" value="{if isset($contact.work_handy)}{text value=$contact.work_handy allowEmpty=true}{/if}" />
 						</div>
 					</div>
 					<div class="col-md-6">
@@ -238,7 +238,7 @@
 							<label class="control-label" for="firma">
 								{lng p="company"}
 							</label>
-							<input type="text" class="form-control" id="firma" name="firma" value="{text value=$contact.firma allowEmpty=true}" />
+							<input type="text" class="form-control" id="firma" name="firma" value="{if isset($contact.firma)}{text value=$contact.firma allowEmpty=true}{/if}" />
 						</div>
 					</div>
 					<div class="col-md-6">
@@ -246,7 +246,7 @@
 							<label class="control-label" for="position">
 								{lng p="position"}
 							</label>
-							<input type="text" class="form-control" id="position" name="position" value="{text value=$contact.position allowEmpty=true}" />
+							<input type="text" class="form-control" id="position" name="position" value="{if isset($contact.position)}{text value=$contact.position allowEmpty=true}{/if}" />
 						</div>
 					</div>
 				</div>
@@ -256,7 +256,7 @@
 							<label class="control-label" for="web">
 								{lng p="web"}
 							</label>
-							<input type="text" class="form-control" id="web" name="web" value="{text value=$contact.web allowEmpty=true}" />
+							<input type="text" class="form-control" id="web" name="web" value="{if isset($contact.web)}{text value=$contact.web allowEmpty=true}{/if}" />
 						</div>
 					</div>
 				</div>
diff --git a/src/templates/modern/nli/login.smsvalidation.tpl b/src/templates/modern/nli/login.smsvalidation.tpl
index e572274..2057205 100644
--- a/src/templates/modern/nli/login.smsvalidation.tpl
+++ b/src/templates/modern/nli/login.smsvalidation.tpl
@@ -1,7 +1,7 @@
 <form action="index.php?action=login" method="post">
 <input type="hidden" name="do" value="login" />
-<input type="hidden" name="email_full" value="{text value=$email}" />
-<input type="hidden" name="passwordMD5" value="{text value=$password}" />
+<input type="hidden" name="email_full" value="{if isset($email)}{text value=$email}{/if}" />
+<input type="hidden" name="passwordMD5" value="{if isset($password)}{text value=$password}{/if}" />
 {if $savelogin}<input type="hidden" name="savelogin" value="true" />{/if}
 
 	<div class="container">