diff --git a/classes/validator/Validator.class.php b/classes/validator/Validator.class.php
index 8a5933b15..a8290f525 100644
--- a/classes/validator/Validator.class.php
+++ b/classes/validator/Validator.class.php
@@ -478,7 +478,7 @@ class Validator
 		// error messages
 		foreach($lang->filter as $key=>$text) {
 			if($text) {
-				$text = addslashes($text);
+				$text = preg_replace('@\r?\n@', '\\n', addslashes($text));
 				$messages[] = "v.cast('ADD_MESSAGE',['{$key}','{$text}']);";
 			}
 		}
diff --git a/classes/xml/XmlJsFilter.class.php b/classes/xml/XmlJsFilter.class.php
index bdd9e8625..db1bae032 100644
--- a/classes/xml/XmlJsFilter.class.php
+++ b/classes/xml/XmlJsFilter.class.php
@@ -241,7 +241,8 @@
 			for($i=0;$i<$target_count;$i++) {
 				$target = $target_list[$i];
 				if(!$lang->{$target}) $lang->{$target} = $target;
-				$js_messages[] = sprintf("v.cast('ADD_MESSAGE',['%s','%s']);", $target, addslashes($lang->{$target}));
+				$text = preg_replace('@\r?\n@', '\\n', addslashes($lang->{$target}));
+				$js_messages[] = "v.cast('ADD_MESSAGE',['{$target}','{$text}']);";
 			}
 
 			// writes the target type
@@ -257,6 +258,7 @@
 			// writes error messages
 			foreach($lang->filter as $key => $val) {
 				if(!$val) $val = $key;
+				$val = preg_replace('@\r?\n@', '\\n', addslashes($val));
 				$js_messages[] = sprintf("v.cast('ADD_MESSAGE',['%s','%s']);", $key, $val);
 			}