diff --git a/lib/weblib.php b/lib/weblib.php
index 4b044d14971..8fedffcc19a 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -101,7 +101,7 @@ function s($var) {
     if ($var == '0') {  // for integer 0, boolean false, string '0'
         return '0';
     }
-    return preg_replace("/&(\w+|#\d+);/i", "&$1;", htmlspecialchars(stripslashes_safe($var)));
+    return preg_replace("/&(#\d+);/i", "&$1;", htmlspecialchars(stripslashes_safe($var)));
 }
 
 /**
@@ -3008,7 +3008,11 @@ function print_textarea($usehtmleditor, $rows, $cols, $width, $height, $name, $v
     }
 
     echo '<textarea id="edit-'. $name .'" name="'. $name .'" rows="'. $rows .'" cols="'. $cols .'">';
-    p($value);
+    if ($usehtmleditor) {
+        echo htmlspecialchars(stripslashes_safe($value)); // needed for editing of cleaned text!
+    } else {
+        p ($value);
+    }
     echo '</textarea>'."\n";
 }