diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index 1543aa205..94e91fa0d 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -386,14 +386,14 @@ $text .= "
 					<tr>
 						<td><label for='sitetag'>".PRFLAN_5."</label></td>
 						<td>
-							".$frm->textarea('sitetag', $pref['sitetag'], 3, 59)."
+							".$frm->textarea('sitetag', $tp->toForm($pref['sitetag']), 3, 59)."
 							<div class='field-help'>Used by some themes. Place 'SITETAG' in your theme to use this value.</div>
 						</td>
 					</tr>
 					<tr>
 						<td><label for='sitedescription'>".PRFLAN_6."</label></td>
 						<td>
-							".$frm->textarea('sitedescription', $pref['sitedescription'], 3, 80)."
+							".$frm->textarea('sitedescription', $tp->toForm($pref['sitedescription']), 3, 80)."
 							<div class='field-help'>Used by some themes. Place 'SITEDESCRIPTION' in your theme to use this value.</div>
 						</td>
 					</tr>
@@ -401,7 +401,7 @@ $text .= "
 					<tr>
 						<td><label for='sitedisclaimer'>".PRFLAN_9."</label></td>
 						<td>
-							".$frm->textarea('sitedisclaimer', str_replace(array('<', '>', '"'), array('&lt;', '&gt;', '&quot;'), $pref['sitedisclaimer']), 3, 80)."
+							".$frm->textarea('sitedisclaimer',$tp->toForm( $pref['sitedisclaimer']), 3, 80)."
 							<div class='field-help'>Used by some themes. Place 'SITEDISCLAIMER' in your theme to use this value.</div>
 						</td>
 					</tr>