diff --git a/forms/TextareaField.php b/forms/TextareaField.php
index 01d1d0467..3f68b8866 100755
--- a/forms/TextareaField.php
+++ b/forms/TextareaField.php
@@ -47,7 +47,7 @@ class TextareaField extends FormField {
 			return $this->createTag(
 				'span',
 				$attributes,
-				($this->value ? $this->value : '<i>(' . _t('FormField.NONE', 'none') . ')</i>')
+				(($this->value) ? htmlentities($this->value) : '<i>(' . _t('FormField.NONE', 'none') . ')</i>')
 			);
 		} else {
 			$attributes = array(
@@ -60,7 +60,7 @@ class TextareaField extends FormField {
 			
 			if($this->disabled) $attributes['disabled'] = 'disabled';
 			
-			return $this->createTag('textarea', $attributes, $this->value);
+			return $this->createTag('textarea', $attributes, htmlentities($this->value));
 		}
 	}