diff --git a/src/CoreFields/CharField.php b/src/CoreFields/CharField.php
index 9f693e8..0ad64b5 100644
--- a/src/CoreFields/CharField.php
+++ b/src/CoreFields/CharField.php
@@ -55,7 +55,7 @@ class CharField extends PhangoField {
 
 		//Delete Javascript tags and simple quotes.
 		$this->value=Utils::form_text($value);
-		return form_text($value);
+		return Utils::form_text($value);
 
 	}
 
diff --git a/src/CoreFields/TextHTMLField.php b/src/CoreFields/TextHTMLField.php
index 7a3620c..526c296 100644
--- a/src/CoreFields/TextHTMLField.php
+++ b/src/CoreFields/TextHTMLField.php
@@ -27,6 +27,7 @@ class TextHTMLField extends PhangoField {
 
 		$this->form='TextAreaForm';
 		$this->multilang=$multilang;
+		$this->set_safe_html_tags();
 
 	}
 
@@ -118,7 +119,7 @@ class TextHTMLField extends PhangoField {
 		$this->allowedtags['i']=array('pattern' => '/&lt;i.*?&gt;(.*?)&lt;\/i&gt;/s', 'replace' => '<i_tmp>$1</i_tmp>', 'example' => '<i></i>');
 		$this->allowedtags['u']=array('pattern' => '/&lt;u.*?&gt;(.*?)&lt;\/u&gt;/s', 'replace' => '<u_tmp>$1</u_tmp>', 'example' => '<u></u>');
 		$this->allowedtags['blockquote']=array('pattern' => '/&lt;blockquote.*?&gt;(.*?)&lt;\/blockquote&gt;/s', 'replace' => '<blockquote_tmp>$1</blockquote_tmp>', 'example' => '<blockquote></blockquote>', 'recursive' => 1);
-		$this->allowedtags['img']=array('pattern' => '/&lt;img.*?alt=&quot;([aA-zZ]+)&quot;.*?src=&quot;('.str_replace('/', '\/', PhangoVar::$base_url).'\/media\/smileys\/[^\r\n\t<"].*?)&quot;.*?\/&gt;/', 'replace' => '<img_tmp alt="$1" src="$2"/>', 'example' => '<img alt="emoticon" src="" />');	
+		//$this->allowedtags['img']=array('pattern' => '/&lt;img.*?alt=&quot;([aA-zZ]+)&quot;.*?src=&quot;('.str_replace('/', '\/', PhangoVar::$base_url).'\/media\/smileys\/[^\r\n\t<"].*?)&quot;.*?\/&gt;/', 'replace' => '<img_tmp alt="$1" src="$2"/>', 'example' => '<img alt="emoticon" src="" />');	
 
 	}