diff --git a/html/inc/text_transform.inc b/html/inc/text_transform.inc
index 6ce7114bce..69ed93183e 100644
--- a/html/inc/text_transform.inc
+++ b/html/inc/text_transform.inc
@@ -68,9 +68,9 @@ function output_transform($text, $options = NULL) {
 		//$text = htmlentities($text);
 		$text = htmlspecialchars($text);
 	}
-	if ($options->htmlscrub) {
-		$text = sanitize_html($text);
-	}
+//	if ($options->htmlscrub) {
+//		$text = sanitize_html($text);
+//	}
 	if ($options->nl2br) {
 		$text = nl2br($text);
 	}
diff --git a/html/user/edit_forum_preferences_action.php b/html/user/edit_forum_preferences_action.php
index 1c79958d7c..1472b0ec97 100644
--- a/html/user/edit_forum_preferences_action.php
+++ b/html/user/edit_forum_preferences_action.php
@@ -82,7 +82,7 @@ $user->setLowRatingThreshold($low_rating_threshold);
 $user->setHighRatingThreshold($high_rating_threshold);
 
 // Update the signature for this user
-$signature = sanitize_html(stripslashes($_POST["signature"]));
+$signature = stripslashes($_POST["signature"]);
 if (strlen($signature)>250) {
     error_page("Your signature was too long, please keep it less than 250 chars");
 }