diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index 71f2c82fb..b9c3eb63d 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -5524,7 +5524,7 @@ class e_admin_ui extends e_admin_controller_ui
 					$att['data'] = 'set';
 				}
 
-				if(($key !== 'options' && false !== varset($att['data']) && null !== varset($att['type']) && !vartrue($att['noedit'])) || vartrue($att['forceSave']))
+				if(($key !== 'options' && false !== varset($att['data']) && null !== varset($att['type'],null) && !vartrue($att['noedit'])) || vartrue($att['forceSave']))
 				{
 					$this->dataFields[$key] = vartrue($att['data'], 'str');
 				}
@@ -5540,7 +5540,7 @@ class e_admin_ui extends e_admin_controller_ui
 			$this->validationRules = array();
 			foreach ($this->fields as $key => $att)
 			{
-				if(null === varset($att['type']) || vartrue($att['noedit']))
+				if(null === varset($att['type'], null) || vartrue($att['noedit']))
 				{
 					continue;
 				}
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index a23cab823..a8cddcc6b 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -4141,7 +4141,7 @@ return;
 	//    libxml_use_internal_errors(true); // hides errors.
         $doc  = $this->domObj;
 	    libxml_use_internal_errors(true);
-        @$doc->loadHTML($html, 'HTML-ENTITIES', 'UTF-8');
+        @$doc->loadHTML($html);
 		// $doc->encoding = 'UTF-8';
 
      //   $doc->resolveExternals = true;