diff --git a/src/admin/templates/prefs.abuse.tpl b/src/admin/templates/prefs.abuse.tpl
index d8fbccd..d3cc751 100644
--- a/src/admin/templates/prefs.abuse.tpl
+++ b/src/admin/templates/prefs.abuse.tpl
@@ -72,7 +72,7 @@
 								<td>{$prefDetails.title}</td>
 								<td>
 									{if $prefDetails.type==1}
-									<input type="text" name="types[{$apTypeID}][prefs][{$prefKey}]" value="{text value=$prefDetails.value}" style="width:100px;" class="smallInput" />
+									<input type="text" name="types[{$apTypeID}][prefs][{$prefKey}]" value="{if isset($prefDetails.value)}{text value=$prefDetails.value}{/if}" style="width:100px;" class="smallInput" />
 									{/if}
 								</td>
 							</tr>
diff --git a/src/admin/templates/prefs.captcha.tpl b/src/admin/templates/prefs.captcha.tpl
index f648c3c..7622323 100644
--- a/src/admin/templates/prefs.captcha.tpl
+++ b/src/admin/templates/prefs.captcha.tpl
@@ -42,7 +42,7 @@
 					{elseif $fieldInfo.type==2}
 						<input type="checkbox" name="prefs[{$key}][{$fieldKey}]" value="1"{if $fieldInfo.value} checked="checked"{/if} />
 					{elseif $fieldInfo.type==1}
-						<input type="text" style="width:85%;" name="prefs[{$key}][{$fieldKey}]" value="{text value=$fieldInfo.value allowEmpty=true}" />
+						<input type="text" style="width:85%;" name="prefs[{$key}][{$fieldKey}]" value="{if isset($fieldInfo.value)}{text value=$fieldInfo.value allowEmpty=true}{/if}" />
 					{/if}
 				</td>
 			</tr>
diff --git a/src/admin/templates/prefs.common.tpl b/src/admin/templates/prefs.common.tpl
index cde7481..c348f30 100644
--- a/src/admin/templates/prefs.common.tpl
+++ b/src/admin/templates/prefs.common.tpl
@@ -148,7 +148,7 @@
 				<td class="td2">
 					<input type="checkbox" id="logs_autodelete" name="logs_autodelete"{if $bm_prefs.logs_autodelete=='yes'} checked="checked"{/if} />
 					<label for="logs_autodelete">{lng p="enableolder"}</label>
-					<input type="number" name="logs_autodelete_days" value="{text value=$bm_prefs.logs_autodelete_days}" size="4" min="1" step="1" />
+					<input type="number" name="logs_autodelete_days" value="{if isset($bm_prefs.logs_autodelete_days)}{text value=$bm_prefs.logs_autodelete_days}{/if}" size="4" min="1" step="1" />
 					{lng p="days"}<br />
 					<input type="checkbox" id="logs_autodelete_archive" name="logs_autodelete_archive"{if $bm_prefs.logs_autodelete_archive=='yes'} checked="checked"{/if} />
 					<label for="logs_autodelete_archive">{lng p="savearc"}</label>
diff --git a/src/admin/templates/prefs.domains.tpl b/src/admin/templates/prefs.domains.tpl
index 3f97742..013174e 100644
--- a/src/admin/templates/prefs.domains.tpl
+++ b/src/admin/templates/prefs.domains.tpl
@@ -23,7 +23,7 @@
 			<td style="text-align:center;"><input type="checkbox" name="domains[{$domain.domain}][in_login]"{if $domain.in_login} checked="checked"{/if} /></td>
 			<td style="text-align:center;"><input type="checkbox" name="domains[{$domain.domain}][in_signup]"{if $domain.in_signup} checked="checked"{/if} /></td>
 			<td style="text-align:center;"><input type="checkbox" name="domains[{$domain.domain}][in_aliases]"{if $domain.in_aliases} checked="checked"{/if} /></td>
-			<td><input type="text" name="domains[{$domain.domain}][pos]" value="{text value=$domain.pos allowEmpty=true}" size="6" /></td>
+			<td><input type="text" name="domains[{$domain.domain}][pos]" value="{if isset($domain.pos)}{text value=$domain.pos allowEmpty=true}{/if}" size="6" /></td>
 			<td>
 				<a href="prefs.common.php?action=domains&delete={$domain.urlDomain}&sid={$sid}" onclick="return confirm('{lng p="realdel"}');"><img src="{$tpldir}images/delete.png" border="0" alt="{lng p="edit"}" width="16" height="16" /></a>
 			</td>
diff --git a/src/admin/templates/prefs.payments.common.tpl b/src/admin/templates/prefs.payments.common.tpl
index 4b0346d..78b106f 100644
--- a/src/admin/templates/prefs.payments.common.tpl
+++ b/src/admin/templates/prefs.payments.common.tpl
@@ -11,12 +11,12 @@
 			</tr>
 			<tr>
 				<td class="td1">{lng p="pay_notification"}:</td>
-				<td class="td2"><input id="send_pay_notification" name="send_pay_notification"{if $bm_prefs.send_pay_notification=='yes'} checked="checked"{/if} type="checkbox" /><label for="send_pay_notification"> {lng p="to2"}: </label><input type="text" name="pay_notification_to" value="{text value=$bm_prefs.pay_notification_to allowEmpty=true}" size="24" /></td>
+				<td class="td2"><input id="send_pay_notification" name="send_pay_notification"{if $bm_prefs.send_pay_notification=='yes'} checked="checked"{/if} type="checkbox" /><label for="send_pay_notification"> {lng p="to2"}: </label><input type="text" name="pay_notification_to" value="{if isset($bm_prefs.pay_notification_to)}{text value=$bm_prefs.pay_notification_to allowEmpty=true}{/if}" size="24" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="sysmailsender"}:</td>
 				<td class="td2">
-					"<input type="text" name="pay_emailfrom" value="{text value=$bm_prefs.pay_emailfrom allowEmpty=true}" size="14" />"
+					"<input type="text" name="pay_emailfrom" value="{if isset($bm_prefs.pay_emailfrom)}{text value=$bm_prefs.pay_emailfrom allowEmpty=true}{/if}" size="14" />"
 					&lt;<input type="text" name="pay_emailfromemail" value="{email value=$bm_prefs.pay_emailfromemail}" size="22" />&gt;
 				</td>
 			</tr>
diff --git a/src/admin/templates/prefs.payments.methods.edit.tpl b/src/admin/templates/prefs.payments.methods.edit.tpl
index bf1a4f4..ac0ba09 100644
--- a/src/admin/templates/prefs.payments.methods.edit.tpl
+++ b/src/admin/templates/prefs.payments.methods.edit.tpl
@@ -7,7 +7,7 @@
 			<tr>
 				<td width="40" valign="top" rowspan="3"><img src="{$tpldir}images/ico_pay_banktransfer.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" value="{text value=$row.title allowEmpty=true}" /></td>
+				<td class="td2"><input type="text" style="width:85%;" name="title" value="{if isset($row.title)}{text value=$row.title allowEmpty=true}{/if}" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="enable"}?</td>
@@ -43,16 +43,16 @@
 			{assign var=lastPos value=$field.pos}
 			<tr class="{$class}">
 				<td><img src="{$tpldir}images/field.png" border="0" alt="" width="16" height="16" /></td>
-				<td><input type="text" style="width: 90%;" name="fields[{$fieldID}][title]" value="{text value=$field.title allowEmpty=true}" /></td>
+				<td><input type="text" style="width: 90%;" name="fields[{$fieldID}][title]" value="{if isset($field.title)}{text value=$field.title allowEmpty=true}{/if}" /></td>
 				<td><select name="fields[{$fieldID}][type]">
 				{foreach from=$fieldTypeTable key=id item=text}
 					<option value="{$id}"{if $id==$field.type} selected="selected"{/if}>{$text}</option>
 				{/foreach}
 				</select></td>
-				<td><input type="text" style="width: 90%;" name="fields[{$fieldID}][options]" value="{text value=$field.options allowEmpty=true}" /></td>
+				<td><input type="text" style="width: 90%;" name="fields[{$fieldID}][options]" value="{if isset($field.options)}{text value=$field.options allowEmpty=true}{/if}" /></td>
 				<td style="text-align:center;"><input type="checkbox" name="fields[{$fieldID}][oblig]"{if $field.oblig} checked="checked"{/if} /></td>
-				<td><input type="text" style="width: 90%;" name="fields[{$fieldID}][rule]" value="{text value=$field.rule allowEmpty=true}" /></td>
-				<td><input type="text" name="fields[{$fieldID}][pos]" value="{text value=$field.pos allowEmpty=true}" size="5" /></td>
+				<td><input type="text" style="width: 90%;" name="fields[{$fieldID}][rule]" value="{if isset($field.rule)}{text value=$field.rule allowEmpty=true}{/if}" /></td>
+				<td><input type="text" name="fields[{$fieldID}][pos]" value="{if isset($field.pos)}{text value=$field.pos allowEmpty=true}{/if}" size="5" /></td>
 				<td style="text-align:center;"><input type="checkbox" name="fields[{$fieldID}][delete]" /></td>
 			</tr>
 			{/foreach}
diff --git a/src/admin/templates/prefs.sms.gateways.edit.tpl b/src/admin/templates/prefs.sms.gateways.edit.tpl
index ae6704e..0af22b6 100644
--- a/src/admin/templates/prefs.sms.gateways.edit.tpl
+++ b/src/admin/templates/prefs.sms.gateways.edit.tpl
@@ -6,7 +6,7 @@
 			<tr>
 				<td width="40" valign="top" rowspan="5"><img src="{$tpldir}images/gateway32.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=$gateway.titel}" /></td>
+				<td class="td2"><input type="text" style="width:85%;" name="titel" value="{if isset($gateway.titel)}{text value=$gateway.titel}{/if}" /></td>
 			</tr>
 			<tr>
 				<td class="td1">{lng p="getstring"}:</td>
@@ -14,15 +14,15 @@
 			</tr>
 			<tr>
 				<td class="td1">{lng p="returnvalue"}:</td>
-				<td class="td2"><input type="text" size="10" name="success" value="{text value=$gateway.success allowEmpty=true}" /></td>
+				<td class="td2"><input type="text" size="10" name="success" value="{if isset($gateway.success)}{text value=$gateway.success allowEmpty=true}{/if}" /></td>
 			</tr>
 			<tr>
 				<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/admin/templates/prefs.templates.prefs.tpl b/src/admin/templates/prefs.templates.prefs.tpl
index c85b8a7..9fa840e 100644
--- a/src/admin/templates/prefs.templates.prefs.tpl
+++ b/src/admin/templates/prefs.templates.prefs.tpl
@@ -26,7 +26,7 @@
 					{elseif $fieldInfo.type==2}
 						<input type="checkbox" name="prefs[{$fieldKey}]" value="1"{if $fieldInfo.value} checked="checked"{/if} />
 					{elseif $fieldInfo.type==1}
-						<input type="text" style="width:85%;" name="prefs[{$fieldKey}]" value="{text value=$fieldInfo.value allowEmpty=true}" />
+						<input type="text" style="width:85%;" name="prefs[{$fieldKey}]" value="{if isset($fieldInfo.value)}{text value=$fieldInfo.value allowEmpty=true}{/if}" />
 					{/if}
 				</td>
 			</tr>
diff --git a/src/admin/templates/toolbox.versions.edit.tpl b/src/admin/templates/toolbox.versions.edit.tpl
index f7ed554..37b0e1e 100644
--- a/src/admin/templates/toolbox.versions.edit.tpl
+++ b/src/admin/templates/toolbox.versions.edit.tpl
@@ -42,7 +42,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/users.edit.tpl b/src/admin/templates/users.edit.tpl
index 3cea104..2227a14 100644
--- a/src/admin/templates/users.edit.tpl
+++ b/src/admin/templates/users.edit.tpl
@@ -29,25 +29,25 @@
 					</tr>
 					<tr>
 						<td class="td1">{lng p="firstname"}:</td>
-						<td class="td2"><input type="text" name="vorname" value="{text value=$user.vorname allowEmpty=true}" style="width:85%;" /></td>
+						<td class="td2"><input type="text" name="vorname" value="{if isset($user.vorname)}{text value=$user.vorname allowEmpty=true}{/if}" style="width:85%;" /></td>
 					</tr>
 					<tr>
 						<td class="td1">{lng p="lastname"}:</td>
-						<td class="td2"><input type="text" name="nachname" value="{text value=$user.nachname allowEmpty=true}" style="width:85%;" /></td>
+						<td class="td2"><input type="text" name="nachname" value="{if isset($user.nachname)}{text value=$user.nachname allowEmpty=true}{/if}" style="width:85%;" /></td>
 					</tr>
 					<tr>
 						<td class="td1">{lng p="company"}:</td>
-						<td class="td2"><input type="text" name="company" value="{text value=$user.company allowEmpty=true}" style="width:85%;" /></td>
+						<td class="td2"><input type="text" name="company" value="{if isset($user.company)}{text value=$user.company allowEmpty=true}{/if}" style="width:85%;" /></td>
 					</tr>
 					<tr>
 						<td class="td1">{lng p="streetno"}:</td>
-						<td class="td2"><input type="text" name="strasse" value="{text value=$user.strasse allowEmpty=true}" style="width:55%;" />
-										<input type="text" name="hnr" value="{text value=$user.hnr allowEmpty=true}" style="width:15%;" /></td>
+						<td class="td2"><input type="text" name="strasse" value="{if isset($user.strasse)}{text value=$user.strasse allowEmpty=true}{/if}" style="width:55%;" />
+										<input type="text" name="hnr" value="{if isset($user.hnr)}{text value=$user.hnr allowEmpty=true}{/if}" style="width:15%;" /></td>
 					</tr>
 					<tr>
 						<td class="td1">{lng p="zipcity"}:</td>
-						<td class="td2"><input type="text" name="plz" value="{text value=$user.plz allowEmpty=true}" style="width:20%;" />
-										<input type="text" name="ort" value="{text value=$user.ort allowEmpty=true}" style="width:50%;" /></td>
+						<td class="td2"><input type="text" name="plz" value="{if isset($user.plz)}{text value=$user.plz allowEmpty=true}{/if}" style="width:20%;" />
+										<input type="text" name="ort" value="{if isset($user.ort)}{text value=$user.ort allowEmpty=true}{/if}" style="width:50%;" /></td>
 					</tr>
 					<tr>
 						<td class="td1">{lng p="country"}:</td>
@@ -59,15 +59,15 @@
 					</tr>
 					<tr>
 						<td class="td1">{lng p="tel"}:</td>
-						<td class="td2"><input type="text" name="tel" value="{text value=$user.tel allowEmpty=true}" style="width:85%;" /></td>
+						<td class="td2"><input type="text" name="tel" value="{if isset($user.tel)}{text value=$user.tel allowEmpty=true}{/if}" style="width:85%;" /></td>
 					</tr>
 					<tr>
 						<td class="td1">{lng p="fax"}:</td>
-						<td class="td2"><input type="text" name="fax" value="{text value=$user.fax allowEmpty=true}" style="width:85%;" /></td>
+						<td class="td2"><input type="text" name="fax" value="{if isset($user.fax)}{text value=$user.fax allowEmpty=true}{/if}" style="width:85%;" /></td>
 					</tr>
 					<tr>
 						<td class="td1">{lng p="cellphone"}:</td>
-						<td class="td2"><input type="text" name="mail2sms_nummer" value="{text value=$user.mail2sms_nummer allowEmpty=true}" style="width:85%;" /></td>
+						<td class="td2"><input type="text" name="mail2sms_nummer" value="{if isset($user.mail2sms_nummer)}{text value=$user.mail2sms_nummer allowEmpty=true}{/if}" style="width:85%;" /></td>
 					</tr>
 					<tr>
 						<td class="td1">{lng p="altmail"}:</td>
@@ -75,7 +75,7 @@
 					</tr>
 					<tr>
 						<td class="td1">{lng p="taxid"}:</td>
-						<td class="td2"><input type="text" name="taxid" value="{text value=$user.taxid}" style="width:85%;" /></td>
+						<td class="td2"><input type="text" name="taxid" value="{if isset($user.taxid)}{text value=$user.taxid}{/if}" style="width:85%;" /></td>
 					</tr>
 
 					{foreach from=$profileFields item=profileField}
@@ -84,18 +84,18 @@
 						<td class="td1">{$profileField.title}:</td>
 						<td class="td2">
 							{if $profileField.type==1}
-								<input type="text" name="field_{$profileField.id}" value="{text value=$profileField.value allowEmpty=true}" style="width:85%;" />
+								<input type="text" name="field_{$profileField.id}" value="{if isset($profileField.value)}{text value=$profileField.value allowEmpty=true}{/if}" style="width:85%;" />
 							{elseif $profileField.type==2}
 								<input type="checkbox" name="field_{$profileField.id}"{if $profileField.value} checked="checked"{/if} />
 							{elseif $profileField.type==4}
 								<select name="field_{$profileField.id}">
 								{foreach from=$profileField.extra item=item}
-									<option value="{text value=$item allowEmpty=true}"{if $profileField.value==$item} selected="selected"{/if}>{text value=$item allowEmpty=true}</option>
+									<option value="{if isset($item allowEmpty=true}"{if $profileField.value==$item} selected="selected"{/if}>{text value=$item)}{text value=$item allowEmpty=true}"{if $profileField.value==$item} selected="selected"{/if}>{text value=$item allowEmpty=true}{/if}</option>
 								{/foreach}
 								</select>
 							{elseif $profileField.type==8}
 								{foreach from=$profileField.extra item=item}
-									<input type="radio" id="field_{$profileField.id}_{$item}" name="field_{$profileField.id}" value="{text value=$item allowEmpty=true}"{if $profileField.value==$item} checked="checked"{/if} />
+									<input type="radio" id="field_{$profileField.id}_{$item}" name="field_{$profileField.id}" value="{if isset($item)}{text value=$item allowEmpty=true}{/if}"{if $profileField.value==$item} checked="checked"{/if} />
 									<label for="field_{$profileField.id}_{$item}"><b>{$item}</b></label> &nbsp;
 								{/foreach}
 							{elseif $profileField.type==32}
@@ -270,8 +270,8 @@
 					<table width="100%">
 						<tr>
 							<td class="td1" width="160">{lng p="re"}/{lng p="fwd"}:</td>
-							<td class="td2"><input type="text" name="re" value="{text value=$user.re allowEmpty=true}" style="width:35%;" />
-											<input type="text" name="fwd" value="{text value=$user.fwd allowEmpty=true}" style="width:35%;" /></td>
+							<td class="td2"><input type="text" name="re" value="{if isset($user.re)}{text value=$user.re allowEmpty=true}{/if}" style="width:35%;" />
+											<input type="text" name="fwd" value="{if isset($user.fwd)}{text value=$user.fwd allowEmpty=true}{/if}" style="width:35%;" /></td>
 						</tr>
 						<tr>
 							<td class="td1">{lng p="mail2sms"}:</td>
@@ -300,11 +300,11 @@
 						</tr>
 						<tr>
 							<td class="td1">{lng p="dateformat"}:</td>
-							<td class="td2"><input type="text" name="datumsformat" value="{text value=$user.datumsformat allowEmpty=true}" style="width:85%;" /></td>
+							<td class="td2"><input type="text" name="datumsformat" value="{if isset($user.datumsformat)}{text value=$user.datumsformat allowEmpty=true}{/if}" style="width:85%;" /></td>
 						</tr>
 						<tr>
 							<td class="td1">{lng p="sendername"}:</td>
-							<td class="td2"><input type="text" name="absendername" value="{text value=$user.absendername allowEmpty=true}" style="width:85%;" /></td>
+							<td class="td2"><input type="text" name="absendername" value="{if isset($user.absendername)}{text value=$user.absendername allowEmpty=true}{/if}" style="width:85%;" /></td>
 						</tr>
 					</table>
 				</div>
diff --git a/src/plugins/templates/pacc.nli.order.tpl b/src/plugins/templates/pacc.nli.order.tpl
index 1469d98..457fef6 100644
--- a/src/plugins/templates/pacc.nli.order.tpl
+++ b/src/plugins/templates/pacc.nli.order.tpl
@@ -69,7 +69,7 @@
 									{lng p="firstname"}
 									<span class="required">{lng p="required"}</span>
 								</label>
-								<input type="text" class="form-control" required="true" name="vorname" id="vorname" value="{text value=$_pf.vorname allowEmpty=true}" />
+								<input type="text" class="form-control" required="true" name="vorname" id="vorname" value="{if isset($_pf.vorname)}{text value=$_pf.vorname allowEmpty=true}{/if}" />
 							</div>
 						</div>
 						<div class="col-md-6">
@@ -78,7 +78,7 @@
 									{lng p="surname"}
 									<span class="required">{lng p="required"}</span>
 								</label>
-								<input type="text" class="form-control" required="true" name="nachname" id="nachname" value="{text value=$_pf.nachname allowEmpty=true}" />
+								<input type="text" class="form-control" required="true" name="nachname" id="nachname" value="{if isset($_pf.nachname)}{text value=$_pf.nachname allowEmpty=true}{/if}" />
 							</div>
 						</div>
 					</div>
@@ -91,7 +91,7 @@
 								<label class="control-label" for="company">
 									{lng p="company"}									
 								</label>
-								<input type="text" class="form-control" required="true" name="company" id="company" value="{text value=$_pf.company allowEmpty=true}" />
+								<input type="text" class="form-control" required="true" name="company" id="company" value="{if isset($_pf.company)}{text value=$_pf.company allowEmpty=true}{/if}" />
 							</div>
 						</div>
 						<div class="col-md-6">
@@ -99,7 +99,7 @@
 								<label class="control-label" for="taxid">
 									{lng p="taxid"}
 								</label>
-								<input type="text" class="form-control" required="true" name="taxid" id="taxid" value="{text value=$_pf.taxid allowEmpty=true}" />
+								<input type="text" class="form-control" required="true" name="taxid" id="taxid" value="{if isset($_pf.taxid)}{text value=$_pf.taxid allowEmpty=true}{/if}" />
 							</div>
 						</div>
 					</div>
@@ -113,7 +113,7 @@
 									{lng p="street"}
 									<span class="required">{lng p="required"}</span>
 								</label>
-								<input type="text" class="form-control" required="true" name="strasse" id="strasse" value="{text value=$_pf.strasse allowEmpty=true}" />
+								<input type="text" class="form-control" required="true" name="strasse" id="strasse" value="{if isset($_pf.strasse)}{text value=$_pf.strasse allowEmpty=true}{/if}" />
 							</div>
 						</div>
 						<div class="col-md-4">
@@ -122,7 +122,7 @@
 									{lng p="nr"}
 									<span class="required">{lng p="required"}</span>
 								</label>
-								<input type="text" class="form-control" required="true" name="hnr" id="hnr" value="{text value=$_pf.hnr allowEmpty=true}" />
+								<input type="text" class="form-control" required="true" name="hnr" id="hnr" value="{if isset($_pf.hnr)}{text value=$_pf.hnr allowEmpty=true}{/if}" />
 							</div>
 						</div>
 					</div>
@@ -133,7 +133,7 @@
 									{lng p="zip"}
 									<span class="required">{lng p="required"}</span>
 								</label>
-								<input type="text" class="form-control" required="true" name="plz" id="plz" value="{text value=$_pf.plz allowEmpty=true}" />
+								<input type="text" class="form-control" required="true" name="plz" id="plz" value="{if isset($_pf.plz)}{text value=$_pf.plz allowEmpty=true}{/if}" />
 							</div>
 						</div>
 						<div class="col-md-8">
@@ -142,7 +142,7 @@
 									{lng p="city"}
 									<span class="required">{lng p="required"}</span>
 								</label>
-								<input type="text" class="form-control" required="true" name="ort" id="ort" value="{text value=$_pf.ort allowEmpty=true}" />
+								<input type="text" class="form-control" required="true" name="ort" id="ort" value="{if isset($_pf.ort)}{text value=$_pf.ort allowEmpty=true}{/if}" />
 							</div>
 						</div>
 					</div>
@@ -208,7 +208,7 @@
 										{if $field.oblig}<span class="required">{lng p="required"}</span>{/if}
 									</label>{/if}
 									{if $field.type==1}
-										<input class="form-control" type="text" name="fields[{$methodID}][{$fieldID}]" id="field_{$methodID}_{$fieldID}" value="{text value=$smarty.post.fields.$methodID.$fieldID allowEmpty=true}" size="40" />
+										<input class="form-control" type="text" name="fields[{$methodID}][{$fieldID}]" id="field_{$methodID}_{$fieldID}" value="{if isset($smarty.post.fields.$methodID.$fieldID)}{text value=$smarty.post.fields.$methodID.$fieldID allowEmpty=true}{/if}" size="40" />
 									{elseif $field.type==2}
 									<label class="control-label">
 										<input type="checkbox" name="fields[{$methodID}][{$fieldID}]" id="field_{$methodID}_{$fieldID}" value="true"{if $smarty.post.fields.$methodID.$fieldID} checked="checked"{/if} />
@@ -217,14 +217,14 @@
 									{elseif $field.type==4}
 										<select class="form-control" name="fields[{$methodID}][{$fieldID}]" id="field_{$methodID}_{$fieldID}">
 											{foreach from=$field.options item=fieldOption}
-											<option value="{text value=$fieldOption allowEmpty=true}"{if $smarty.post.fields.$methodID.$fieldID==$fieldOption} selected="selected"{/if}>{text value=$fieldOption}</option>
+											<option value="{if isset($fieldOption)}{text value=$fieldOption allowEmpty=true}{/if}"{if $smarty.post.fields.$methodID.$fieldID==$fieldOption} selected="selected"{/if}>{text value=$fieldOption}</option>
 											{/foreach}
 										</select>
 									{elseif $field.type==8}
 										{foreach from=$field.options key=fieldOptionID item=fieldOption}
 										<div class="radio">
 											<label>
-												<input type="radio" name="fields[{$methodID}][{$fieldID}]" value="{text value=$fieldOption allowEmpty=true}" id="field_{$methodID}_{$fieldID}_{$fieldOptionID}"{if $smarty.post.fields.$methodID.$fieldID==$fieldOption} checked="checked"{/if} />
+												<input type="radio" name="fields[{$methodID}][{$fieldID}]" value="{if isset($fieldOption)}{text value=$fieldOption allowEmpty=true}{/if}" id="field_{$methodID}_{$fieldID}_{$fieldOptionID}"{if $smarty.post.fields.$methodID.$fieldID==$fieldOption} checked="checked"{/if} />
 												<label for="field_{$methodID}_{$fieldID}_{$fieldOptionID}">{text value=$fieldOption}</label>
 											</label>
 										</div>
diff --git a/src/plugins/templates/pacc.user.order.tpl b/src/plugins/templates/pacc.user.order.tpl
index 2be84b2..60e4d51 100644
--- a/src/plugins/templates/pacc.user.order.tpl
+++ b/src/plugins/templates/pacc.user.order.tpl
@@ -70,28 +70,28 @@
 	<tr>
 		<td class="listTableLeft">* <label for="company">{lng p="company"}</label>:</td>
 		<td class="listTableRight">
-			<input type="text" name="company" id="company" value="{text value=$_pf.company allowEmpty=true}" size="35" />
+			<input type="text" name="company" id="company" value="{if isset($_pf.company)}{text value=$_pf.company allowEmpty=true}{/if}" size="35" />
 		</td>
 	</tr>
 	<tr>
 		<td class="listTableLeft">* <label for="vorname">{lng p="firstname"}</label>/<label for="nachname">{lng p="surname"}</label>:</td>
 		<td class="listTableRight">
-			<input type="text" name="vorname" id="vorname" value="{text value=$_pf.vorname allowEmpty=true}" size="22" />
-			<input type="text" name="nachname" id="nachname" value="{text value=$_pf.nachname allowEmpty=true}" size="22" />
+			<input type="text" name="vorname" id="vorname" value="{if isset($_pf.vorname)}{text value=$_pf.vorname allowEmpty=true}{/if}" size="22" />
+			<input type="text" name="nachname" id="nachname" value="{if isset($_pf.nachname)}{text value=$_pf.nachname allowEmpty=true}{/if}" size="22" />
 		</td>
 	</tr>
 	<tr>
 		<td class="listTableLeft">* <label for="strasse">{lng p="streetnr"}</label>:</td>
 		<td class="listTableRight">
-			<input type="text" name="strasse" id="strasse" value="{text value=$_pf.strasse allowEmpty=true}" size="35" />
-			<input type="text" name="hnr" id="hnr" value="{text value=$_pf.hnr allowEmpty=true}" size="6" />
+			<input type="text" name="strasse" id="strasse" value="{if isset($_pf.strasse)}{text value=$_pf.strasse allowEmpty=true}{/if}" size="35" />
+			<input type="text" name="hnr" id="hnr" value="{if isset($_pf.hnr)}{text value=$_pf.hnr allowEmpty=true}{/if}" size="6" />
 		</td>
 	</tr>
 	<tr>
 		<td class="listTableLeft">* <label for="plz">{lng p="zipcity"}:</label></td>
 		<td class="listTableRight">
-			<input type="text" name="plz" id="plz" value="{text value=$_pf.plz allowEmpty=true}" size="6" />
-			<input type="text" name="ort" id="ort" value="{text value=$_pf.ort allowEmpty=true}" size="35" />
+			<input type="text" name="plz" id="plz" value="{if isset($_pf.plz)}{text value=$_pf.plz allowEmpty=true}{/if}" size="6" />
+			<input type="text" name="ort" id="ort" value="{if isset($_pf.ort)}{text value=$_pf.ort allowEmpty=true}{/if}" size="35" />
 		</td>
 	</tr>
 	<tr>
@@ -107,7 +107,7 @@
 	<tr>
 		<td class="listTableLeft">* <label for="taxid">{lng p="taxid"}</label>:</td>
 		<td class="listTableRight">
-			<input type="text" name="taxid" id="taxid" value="{text value=$_pf.taxid allowEmpty=true}" size="35" />
+			<input type="text" name="taxid" id="taxid" value="{if isset($_pf.taxid)}{text value=$_pf.taxid allowEmpty=true}{/if}" size="35" />
 		</td>
 	</tr>
 {/if}
@@ -146,18 +146,18 @@
 			</td>
 			<td class="listTableRight">
 			{if $field.type==1}
-				<input type="text" name="fields[{$methodID}][{$fieldID}]" id="field_{$methodID}_{$fieldID}" value="{text value=$smarty.post.fields.$methodID.$fieldID allowEmpty=true}" size="40" />
+				<input type="text" name="fields[{$methodID}][{$fieldID}]" id="field_{$methodID}_{$fieldID}" value="{if isset($smarty.post.fields.$methodID.$fieldID)}{text value=$smarty.post.fields.$methodID.$fieldID allowEmpty=true}{/if}" size="40" />
 			{elseif $field.type==2}
 				<input type="checkbox" name="fields[{$methodID}][{$fieldID}]" id="field_{$methodID}_{$fieldID}" value="true"{if $smarty.post.fields.$methodID.$fieldID} checked="checked"{/if} />
 			{elseif $field.type==4}
 				<select name="fields[{$methodID}][{$fieldID}]" id="field_{$methodID}_{$fieldID}">
 					{foreach from=$field.options item=fieldOption}
-					<option value="{text value=$fieldOption allowEmpty=true}"{if $smarty.post.fields.$methodID.$fieldID==$fieldOption} selected="selected"{/if}>{text value=$fieldOption}</option>
+					<option value="{if isset($fieldOption)}{text value=$fieldOption allowEmpty=true}{/if}"{if $smarty.post.fields.$methodID.$fieldID==$fieldOption} selected="selected"{/if}>{text value=$fieldOption}</option>
 					{/foreach}
 				</select>
 			{elseif $field.type==8}
 				{foreach from=$field.options key=fieldOptionID item=fieldOption}
-					<input type="radio" name="fields[{$methodID}][{$fieldID}]" value="{text value=$fieldOption allowEmpty=true}" id="field_{$methodID}_{$fieldID}_{$fieldOptionID}"{if $smarty.post.fields.$methodID.$fieldID==$fieldOption} checked="checked"{/if} />
+					<input type="radio" name="fields[{$methodID}][{$fieldID}]" value="{if isset($fieldOption)}{text value=$fieldOption allowEmpty=true}{/if}" id="field_{$methodID}_{$fieldID}_{$fieldOptionID}"{if $smarty.post.fields.$methodID.$fieldID==$fieldOption} checked="checked"{/if} />
 					<label for="field_{$methodID}_{$fieldID}_{$fieldOptionID}">{text value=$fieldOption}</label>
 				{/foreach}
 			{elseif $field.type==32}
diff --git a/src/templates/modern/li/email.sent.tpl b/src/templates/modern/li/email.sent.tpl
index b37c56b..bc05d0c 100644
--- a/src/templates/modern/li/email.sent.tpl
+++ b/src/templates/modern/li/email.sent.tpl
@@ -32,10 +32,10 @@
 					{foreach from=$addrMails item=item key=i}
 					{cycle values="listTableTR,listTableTR2" assign="class"}
 					<tr class="{$class}">
-						<td><input type="checkbox" name="addr[{$i}][email]" value="{text value=$item.email}" id="addr_{$i}" checked="checked" /></td>
+						<td><input type="checkbox" name="addr[{$i}][email]" value="{if isset($item.email)}{text value=$item.email}{/if}" id="addr_{$i}" checked="checked" /></td>
 						<td><label for="addr_{$i}">{text value=$item.email cut=35}</label></td>
-						<td><input type="text" name="addr[{$i}][firstname]" value="{text value=$item.firstname allowEmpty=true}" style="width:95%;" /></td>
-						<td><input type="text" name="addr[{$i}][lastname]" value="{text value=$item.lastname allowEmpty=true}" style="width:95%;" /></td>
+						<td><input type="text" name="addr[{$i}][firstname]" value="{if isset($item.firstname)}{text value=$item.firstname allowEmpty=true}{/if}" style="width:95%;" /></td>
+						<td><input type="text" name="addr[{$i}][lastname]" value="{if isset($item.lastname)}{text value=$item.lastname allowEmpty=true}{/if}" style="width:95%;" /></td>
 						<td><input type="text" name="addr[{$i}][company]" style="width:95%;" /></td>
 					</tr>
 					{/foreach}
@@ -45,20 +45,20 @@
 				<table class="listTable">
 					<tr>
 						<td class="listTableHead" colspan="2">
-							<input type="checkbox" name="addr[{$i}][email]" value="{text value=$item.email}" id="addr_{$i}" checked="checked" />
+							<input type="checkbox" name="addr[{$i}][email]" value="{if isset($item.email)}{text value=$item.email}{/if}" id="addr_{$i}" checked="checked" />
 							<label for="addr_{$i}">{text value=$item.email}</label>
 						</td>
 					</tr>
 					<tr>
 						<td class="listTableLeft"><label>{lng p="firstname"}:</label></td>
 						<td class="listTableRight">
-							<input type="text" name="addr[{$i}][firstname]" value="{text value=$item.firstname allowEmpty=true}" size="30" />
+							<input type="text" name="addr[{$i}][firstname]" value="{if isset($item.firstname)}{text value=$item.firstname allowEmpty=true}{/if}" size="30" />
 						</td>
 					</tr>
 					<tr>
 						<td class="listTableLeft"><label>{lng p="surname"}:</label></td>
 						<td class="listTableRight">
-							<input type="text" name="addr[{$i}][lastname]" value="{text value=$item.lastname allowEmpty=true}" size="30" />
+							<input type="text" name="addr[{$i}][lastname]" value="{if isset($item.lastname)}{text value=$item.lastname allowEmpty=true}{/if}" size="30" />
 						</td>
 					</tr>
 					<tr>
diff --git a/src/templates/modern/li/payment.form.tpl b/src/templates/modern/li/payment.form.tpl
index 31d73b7..fcfff96 100644
--- a/src/templates/modern/li/payment.form.tpl
+++ b/src/templates/modern/li/payment.form.tpl
@@ -11,22 +11,22 @@
 	<tr>
 		<td class="listTableLeft">* <label for="vorname">{lng p="firstname"}</label>/<label for="nachname">{lng p="surname"}</label>:</td>
 		<td class="listTableRight">
-			<input type="text" name="vorname" id="vorname" value="{text value=$_pf.vorname allowEmpty=true}" size="22" />
-			<input type="text" name="nachname" id="nachname" value="{text value=$_pf.nachname allowEmpty=true}" size="22" />
+			<input type="text" name="vorname" id="vorname" value="{if isset($_pf.vorname)}{text value=$_pf.vorname allowEmpty=true}{/if}" size="22" />
+			<input type="text" name="nachname" id="nachname" value="{if isset($_pf.nachname)}{text value=$_pf.nachname allowEmpty=true}{/if}" size="22" />
 		</td>
 	</tr>
 	<tr>
 		<td class="listTableLeft">* <label for="strasse">{lng p="streetnr"}</label>:</td>
 		<td class="listTableRight">
-			<input type="text" name="strasse" id="strasse" value="{text value=$_pf.strasse allowEmpty=true}" size="35" />
-			<input type="text" name="hnr" id="hnr" value="{text value=$_pf.hnr allowEmpty=true}" size="6" />
+			<input type="text" name="strasse" id="strasse" value="{if isset($_pf.strasse)}{text value=$_pf.strasse allowEmpty=true}{/if}" size="35" />
+			<input type="text" name="hnr" id="hnr" value="{if isset($_pf.hnr)}{text value=$_pf.hnr allowEmpty=true}{/if}" size="6" />
 		</td>
 	</tr>
 	<tr>
 		<td class="listTableLeft">* <label for="plz">{lng p="zipcity"}:</label></td>
 		<td class="listTableRight">
-			<input type="text" name="plz" id="plz" value="{text value=$_pf.plz allowEmpty=true}" size="6" />
-			<input type="text" name="ort" id="ort" value="{text value=$_pf.ort allowEmpty=true}" size="35" />
+			<input type="text" name="plz" id="plz" value="{if isset($_pf.plz)}{text value=$_pf.plz allowEmpty=true}{/if}" size="6" />
+			<input type="text" name="ort" id="ort" value="{if isset($_pf.ort)}{text value=$_pf.ort allowEmpty=true}{/if}" size="35" />
 		</td>
 	</tr>
 {/if}
@@ -71,18 +71,18 @@
 			</td>
 			<td class="listTableRight">
 			{if $field.type==1}
-				<input type="text" name="fields[{$methodID}][{$fieldID}]" id="field_{$methodID}_{$fieldID}" value="{text value=$smarty.post.fields.$methodID.$fieldID allowEmpty=true}" size="40" />
+				<input type="text" name="fields[{$methodID}][{$fieldID}]" id="field_{$methodID}_{$fieldID}" value="{if isset($smarty.post.fields.$methodID.$fieldID)}{text value=$smarty.post.fields.$methodID.$fieldID allowEmpty=true}{/if}" size="40" />
 			{elseif $field.type==2}
 				<input type="checkbox" name="fields[{$methodID}][{$fieldID}]" id="field_{$methodID}_{$fieldID}" value="true"{if $smarty.post.fields.$methodID.$fieldID} checked="checked"{/if} />
 			{elseif $field.type==4}
 				<select name="fields[{$methodID}][{$fieldID}]" id="field_{$methodID}_{$fieldID}">
 					{foreach from=$field.options item=fieldOption}
-					<option value="{text value=$fieldOption allowEmpty=true}"{if $smarty.post.fields.$methodID.$fieldID==$fieldOption} selected="selected"{/if}>{text value=$fieldOption}</option>
+					<option value="{if isset($fieldOption)}{text value=$fieldOption allowEmpty=true}{/if}"{if $smarty.post.fields.$methodID.$fieldID==$fieldOption} selected="selected"{/if}>{text value=$fieldOption}</option>
 					{/foreach}
 				</select>
 			{elseif $field.type==8}
 				{foreach from=$field.options key=fieldOptionID item=fieldOption}
-					<input type="radio" name="fields[{$methodID}][{$fieldID}]" value="{text value=$fieldOption allowEmpty=true}" id="field_{$methodID}_{$fieldID}_{$fieldOptionID}"{if $smarty.post.fields.$methodID.$fieldID==$fieldOption} checked="checked"{/if} />
+					<input type="radio" name="fields[{$methodID}][{$fieldID}]" value="{if isset($fieldOption)}{text value=$fieldOption allowEmpty=true}{/if}" id="field_{$methodID}_{$fieldID}_{$fieldOptionID}"{if $smarty.post.fields.$methodID.$fieldID==$fieldOption} checked="checked"{/if} />
 					<label for="field_{$methodID}_{$fieldID}_{$fieldOptionID}">{text value=$fieldOption}</label>
 				{/foreach}
 			{elseif $field.type==32}
diff --git a/src/templates/modern/li/prefs.common.tpl b/src/templates/modern/li/prefs.common.tpl
index 980ac22..2932b29 100644
--- a/src/templates/modern/li/prefs.common.tpl
+++ b/src/templates/modern/li/prefs.common.tpl
@@ -161,11 +161,11 @@
 		<tr>
 			<td class="listTableLeft"><label for="re">{lng p="defaults"} (1):</label></td>
 			<td class="listTableRight">
-				<i class="fa fa-id-card-o" aria-hidden="true"></i> <input type="checkbox" name="composeDefaults[attachVCard]" id="attachVCard"{if $composeDefaults.attachVCard} checked="checked"{/if} /> <label for="attachVCard">{lng p="attachvc"}</label>
+				<i class="fa fa-id-card-o" aria-hidden="true"></i> <input type="checkbox" name="composeDefaults[attachVCard]" id="attachVCard"{if isset($composeDefaults.attachVCard)} checked="checked"{/if} /> <label for="attachVCard">{lng p="attachvc"}</label>
 				&nbsp;
-				<i class="fa fa-certificate" aria-hidden="true"></i> <input type="checkbox" name="composeDefaults[certMail]" id="certMail"{if $composeDefaults.certMail} checked="checked"{/if} /> <label for="certMail">{lng p="certmail"}</label>
+				<i class="fa fa-certificate" aria-hidden="true"></i> <input type="checkbox" name="composeDefaults[certMail]" id="certMail"{if isset($composeDefaults.certMail)} checked="checked"{/if} /> <label for="certMail">{lng p="certmail"}</label>
 				&nbsp;
-				<i class="fa fa-bullhorn" aria-hidden="true"></i> <input type="checkbox" name="composeDefaults[mailConfirmation]" id="mailConfirmation"{if $composeDefaults.mailConfirmation} checked="checked"{/if} /> <label for="mailConfirmation">{lng p="mailconfirmation"}</label>
+				<i class="fa fa-bullhorn" aria-hidden="true"></i> <input type="checkbox" name="composeDefaults[mailConfirmation]" id="mailConfirmation"{if isset($composeDefaults.mailConfirmation)} checked="checked"{/if} /> <label for="mailConfirmation">{lng p="mailconfirmation"}</label>
 
 			</td>
 		</tr>
diff --git a/src/templates/modern/li/prefs.contact.tpl b/src/templates/modern/li/prefs.contact.tpl
index b8b0b0b..600e1f1 100644
--- a/src/templates/modern/li/prefs.contact.tpl
+++ b/src/templates/modern/li/prefs.contact.tpl
@@ -37,19 +37,19 @@
 		<tr>
 			<td class="listTableLeft">* <label for="vorname">{lng p="firstname"}</label>:</td>
 			<td class="listTableRight">
-				<input type="text" name="vorname" id="vorname" value="{text value=$vorname allowEmpty=true}" size="35" required />
+				<input type="text" name="vorname" id="vorname" value="{if isset($vorname)}{text value=$vorname allowEmpty=true}{/if}" size="35" required />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft">* <label for="nachname">{lng p="surname"}</label>:</td>
 			<td class="listTableRight">
-				<input type="text" name="nachname" id="nachname" value="{text value=$nachname allowEmpty=true}" size="35" required />
+				<input type="text" name="nachname" id="nachname" value="{if isset($nachname)}{text value=$nachname allowEmpty=true}{/if}" size="35" required />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="company">{lng p="company"}</label>:</td>
 			<td class="listTableRight">
-				<input type="text" name="company" id="company" value="{text value=$company allowEmpty=true}" size="35" />
+				<input type="text" name="company" id="company" value="{if isset($company)}{text value=$company allowEmpty=true}{/if}" size="35" />
 			</td>
 		</tr>
 		
@@ -60,15 +60,15 @@
 		{if $f_strasse!="n"}<tr>
 			<td class="listTableLeft">{if $f_strasse=="p"}*{/if} <label for="strasse">{lng p="streetnr"}</label>:</td>
 			<td class="listTableRight">
-				<input type="text" name="strasse" id="strasse" value="{text value=$strasse allowEmpty=true}" size="35" {if $f_strasse=="p"}required{/if} />
-				<input type="text" name="hnr" id="hnr" value="{text value=$hnr allowEmpty=true}" size="6" {if $f_strasse=="p"}required{/if} />
+				<input type="text" name="strasse" id="strasse" value="{if isset($strasse)}{text value=$strasse allowEmpty=true}{/if}" size="35" {if $f_strasse=="p"}required{/if} />
+				<input type="text" name="hnr" id="hnr" value="{if isset($hnr)}{text value=$hnr allowEmpty=true}{/if}" size="6" {if $f_strasse=="p"}required{/if} />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft">{if $f_strasse=="p"}*{/if} <label for="plz">{lng p="zipcity"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" name="plz" id="plz" value="{text value=$plz allowEmpty=true}" size="6" {if $f_strasse=="p"}required{/if} />
-				<input type="text" name="ort" id="ort" value="{text value=$ort allowEmpty=true}" size="35" {if $f_strasse=="p"}required{/if} />
+				<input type="text" name="plz" id="plz" value="{if isset($plz)}{text value=$plz allowEmpty=true}{/if}" size="6" {if $f_strasse=="p"}required{/if} />
+				<input type="text" name="ort" id="ort" value="{if isset($ort)}{text value=$ort allowEmpty=true}{/if}" size="35" {if $f_strasse=="p"}required{/if} />
 			</td>
 		</tr>
 		<tr>
@@ -84,13 +84,13 @@
 		{if $f_telefon!="n"}<tr>
 			<td class="listTableLeft">{if $f_telefon=="p"}*{/if} <label for="tel">{lng p="phone"}:</label></td>
 			<td class="listTableRight">	
-				<input type="tel" name="tel" id="tel" value="{text value=$tel allowEmpty=true}" size="35" {if $f_telefon=="p"}required{/if} />
+				<input type="tel" name="tel" id="tel" value="{if isset($tel)}{text value=$tel allowEmpty=true}{/if}" size="35" {if $f_telefon=="p"}required{/if} />
 			</td>
 		</tr>{/if}
 		{if $f_fax!="n"}<tr>
 			<td class="listTableLeft">{if $f_fax=="p"}*{/if} <label for="fax">{lng p="fax"}:</label></td>
 			<td class="listTableRight">	
-				<input type="tel" name="fax" id="fax" value="{text value=$fax allowEmpty=true}" size="35" {if $f_fax=="p"}required{/if} />
+				<input type="tel" name="fax" id="fax" value="{if isset($fax)}{text value=$fax allowEmpty=true}{/if}" size="35" {if $f_fax=="p"}required{/if} />
 			</td>
 		</tr>{/if}
 		{if $f_mail2sms_nummer!="n"}<tr>
@@ -107,13 +107,13 @@
 		{if $f_alternativ!="n"}<tr>
 			<td class="listTableLeft">{if $f_alternativ=="p"}*{/if} <label for="altmail">{lng p="altmail2"}:</label></td>
 			<td class="listTableRight">	
-				<input type="email" name="altmail" id="altmail" value="{text value=$altmail allowEmpty=true}" size="35" {if $f_alternativ=="p"}required{/if} />
+				<input type="email" name="altmail" id="altmail" value="{if isset($altmail)}{text value=$altmail allowEmpty=true}{/if}" size="35" {if $f_alternativ=="p"}required{/if} />
 			</td>
 		</tr>{/if}
 		<tr>
 			<td class="listTableLeft"><label for="taxid">{lng p="taxid"}</label>:</td>
 			<td class="listTableRight">
-				<input type="text" name="taxid" id="taxid" value="{text value=$taxid allowEmpty=true}" size="35" />
+				<input type="text" name="taxid" id="taxid" value="{if isset($taxid)}{text value=$taxid allowEmpty=true}{/if}" size="35" />
 			</td>
 		</tr>
 		{foreach from=$profileFields item=profileField}
@@ -122,7 +122,7 @@
 			<td class="listTableLeft">{if $profileField.needed}*{/if} <label for="field_{$profileField.id}">{$profileField.title}</label>:</td>
 			<td class="listTableRight">
 				{if $profileField.type==1}
-					<input type="text" id="field_{$profileField.id}" name="field_{$profileField.id}" value="{text value=$profileField.value allowEmpty=true}" size="35" />
+					<input type="text" id="field_{$profileField.id}" name="field_{$profileField.id}" value="{if isset($profileField.value)}{text value=$profileField.value allowEmpty=true}{/if}" size="35" />
 				{elseif $profileField.type==2}
 					<input type="checkbox" id="field_{$profileField.id}" name="field_{$profileField.id}"{if $profileField.value} checked="checked"{/if} />
 				{elseif $profileField.type==4}
diff --git a/src/templates/modern/li/prefs.filters.actions.tpl b/src/templates/modern/li/prefs.filters.actions.tpl
index 88b0b41..6d2fb71 100644
--- a/src/templates/modern/li/prefs.filters.actions.tpl
+++ b/src/templates/modern/li/prefs.filters.actions.tpl
@@ -55,7 +55,7 @@
 		
 		<span id="mailValue_{$action.id}" style="display:none;">
 			{lng p="to2"}
-			<input type="text" name="mail_val_{$action.id}" value="{text value=$action.text_val allowEmpty=true}" size="24" />
+			<input type="text" name="mail_val_{$action.id}" value="{if isset($action.text_val)}{text value=$action.text_val allowEmpty=true}{/if}" size="24" />
 		</span>
 		
 		<span id="draftValue_{$action.id}" style="display:none;">
diff --git a/src/templates/modern/li/prefs.filters.conditions.tpl b/src/templates/modern/li/prefs.filters.conditions.tpl
index cbc4dd6..ee9def7 100644
--- a/src/templates/modern/li/prefs.filters.conditions.tpl
+++ b/src/templates/modern/li/prefs.filters.conditions.tpl
@@ -47,13 +47,13 @@
 				<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="attComparison_{$condition.id}" style="display:none;">
 			<!-- op: 1 -->{lng p="contains"} 
 			
-			<input type="text" size="20" name="att_val_{$condition.id}" value="{text value=$condition.val allowEmpty=true}" />
+			<input type="text" size="20" name="att_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/start.customize.tpl b/src/templates/modern/li/start.customize.tpl
index 028e9da..12c54c7 100644
--- a/src/templates/modern/li/start.customize.tpl
+++ b/src/templates/modern/li/start.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}