diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 7d56736cdc..09d303bec7 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -703,8 +703,8 @@ class BaseDocument(object):
 			sanitized_value = value
 
 			if df and (df.get("ignore_xss_filter")
-				or (df.get("fieldtype")=="Code" and df.get("options")!="Email")
-				or df.get("fieldtype") in ("Attach", "Attach Image", "Barcode")
+				or (df.get("fieldtype") in ("Data", "Small Text", "Text") and df.get("options")=="Email")
+				or df.get("fieldtype") in ("Attach", "Attach Image", "Barcode", "Code")
 
 				# cancelled and submit but not update after submit should be ignored
 				or self.docstatus==2