diff --git a/templates/kt3/fields/base.smarty b/templates/kt3/fields/base.smarty
index 0ed3187..084229e 100644
--- a/templates/kt3/fields/base.smarty
+++ b/templates/kt3/fields/base.smarty
@@ -11,5 +11,5 @@
       <p class="errorMessage"></p>
       {/if}
 
-      <input type="text" name="{$name}" {if $has_id}id="{$id}"{/if} {if $has_value}value="{$value}"{/if}{if ($options.autocomplete === false)}autocomplete="off"{/if}  {if $options.width}size="{$options.width}"{/if} /><input type="hidden" name="kt_core_fieldsets_expect[{$name}]" value ="1"  />
+      <input type="text" name="{$name}" {if $has_id}id="{$id}"{/if} {if $has_value}value="{$value|htmlentities}"{/if}{if ($options.autocomplete === false)}autocomplete="off"{/if}  {if $options.width}size="{$options.width}"{/if} /><input type="hidden" name="kt_core_fieldsets_expect[{$name}]" value ="1"  />
      </div>
diff --git a/templates/ktcore/boolean_search_edit.smarty b/templates/ktcore/boolean_search_edit.smarty
index 9e5d08b..f7003b2 100644
--- a/templates/ktcore/boolean_search_edit.smarty
+++ b/templates/ktcore/boolean_search_edit.smarty
@@ -62,7 +62,7 @@ legend { border: 1px dotted #999;}
     <input type="hidden" name="action" value="updateSearch" />
 	<input type="hidden" name="fSavedSearchId" value="{$iSearchId}" />
 {if $sNameTitle}
-    {$sNameTitle}: <input type="text" name="name" value="{$old_name}" /> <br />
+    {$sNameTitle}: <input type="text" name="name" value="{$old_name|htmlentities}" /> <br />
 {/if}
 
 {capture assign=options}
diff --git a/templates/ktcore/forms/widgets/selection.smarty b/templates/ktcore/forms/widgets/selection.smarty
index 4b8fdc8..fefda0c 100644
--- a/templates/ktcore/forms/widgets/selection.smarty
+++ b/templates/ktcore/forms/widgets/selection.smarty
@@ -6,11 +6,11 @@
     {if $options.multi}multiple="true"{/if} 
     >
     {if $options.initial_string}
-    <option value="">{$options.initial_string}</option>
+    <option value="">{$options.initial_string|htmlentities}</option>
     {/if}    
   {foreach item=lookup key=lookup_key from=$vocab}
 
-       <option value="{$lookup_key}" {if ($value == $lookup_key)}selected="selected"{/if}>{$lookup}</option>
+       <option value="{$lookup_key|htmlentities}" {if ($value == $lookup_key)}selected="selected"{/if}>{$lookup|htmlentities}</option>
   {/foreach}
   </select>
 {/if}
diff --git a/templates/ktcore/forms/widgets/string.smarty b/templates/ktcore/forms/widgets/string.smarty
index 8bad37a..af34f65 100644
--- a/templates/ktcore/forms/widgets/string.smarty
+++ b/templates/ktcore/forms/widgets/string.smarty
@@ -1 +1 @@
-  <input type="text" name="{$name}" {if $has_id}id="{$id}"{/if} {if $has_value}value="{$value}"{/if}{if ($options.autocomplete === false)}autocomplete="off"{/if}  {if $options.width}size="{$options.width}"{/if} />
+  <input type="text" name="{$name}" {if $has_id}id="{$id}"{/if} {if $has_value}value="{$value|htmlentities}"{/if}{if ($options.autocomplete === false)}autocomplete="off"{/if}  {if $options.width}size="{$options.width}"{/if} />
diff --git a/templates/ktcore/forms/widgets/text.smarty b/templates/ktcore/forms/widgets/text.smarty
index b269a64..531e564 100644
--- a/templates/ktcore/forms/widgets/text.smarty
+++ b/templates/ktcore/forms/widgets/text.smarty
@@ -2,4 +2,4 @@
         {if $has_id} id="{$id}"{/if}
         {if $options.rows} rows="{$options.rows}"{else} rows="7"{/if}
         {if $options.cols} cols="{$options.cols}"{else} cols="45"{/if}
-      >{if $has_value}{$value}{/if}</textarea>
+      >{if $has_value}{$value|htmlentities}{/if}</textarea>