diff --git a/app/dialplans/dialplan_xml.php b/app/dialplans/dialplan_xml.php
index 618aabf937..4fa94cc679 100644
--- a/app/dialplans/dialplan_xml.php
+++ b/app/dialplans/dialplan_xml.php
@@ -181,9 +181,9 @@
 // load editor preferences/defaults
 	$setting_size = !empty($_SESSION["editor"]["font_size"]["text"]) ? $_SESSION["editor"]["font_size"]["text"] : '12px';
 	$setting_theme = !empty($_SESSION["editor"]["theme"]["text"]) ? $_SESSION["editor"]["theme"]["text"] : 'cobalt';
-	$setting_invisibles = filter_var($_SESSION["editor"]["invisibles"]["boolean"] ?? false, FILTER_VALIDATE_BOOL);
-	$setting_indenting = filter_var($_SESSION["editor"]["indent_guides"]["boolean"] ?? false, FILTER_VALIDATE_BOOL);
-	$setting_numbering = filter_var($_SESSION["editor"]["line_numbers"]["boolean"] ?? true, FILTER_VALIDATE_BOOL);
+	$setting_invisibles = isset($_SESSION['editor']['invisibles']['text']) ? $_SESSION['editor']['invisibles']["text"] : 'false';
+	$setting_indenting = isset($_SESSION['editor']['indent_guides']['text']) ? $_SESSION['editor']['indent_guides']["text"]: 'false';
+	$setting_numbering = isset($_SESSION['editor']['line_numbers']['text']) ? $_SESSION['editor']['line_numbers']["text"] : 'true';
 
 //create token
 	$object = new token;
diff --git a/app/email_queue/email_queue_edit.php b/app/email_queue/email_queue_edit.php
index df4e2b94c0..c29b29cdf5 100644
--- a/app/email_queue/email_queue_edit.php
+++ b/app/email_queue/email_queue_edit.php
@@ -236,9 +236,9 @@
 //load editor preferences/defaults
 	$setting_size = !empty($_SESSION["editor"]["font_size"]["text"]) ? $_SESSION["editor"]["font_size"]["text"] : '12px';
 	$setting_theme = !empty($_SESSION["editor"]["theme"]["text"]) ? $_SESSION["editor"]["theme"]["text"] : 'cobalt';
-	$setting_invisibles = filter_var($_SESSION["editor"]["invisibles"]["boolean"] ?? false, FILTER_VALIDATE_BOOL);
-	$setting_indenting = filter_var($_SESSION["editor"]["indent_guides"]["boolean"] ?? false, FILTER_VALIDATE_BOOL);
-	$setting_numbering = filter_var($_SESSION["editor"]["line_numbers"]["boolean"] ?? true, FILTER_VALIDATE_BOOL);
+	$setting_invisibles = isset($_SESSION['editor']['invisibles']['text']) ? $_SESSION['editor']['invisibles']["text"] : 'false';
+	$setting_indenting = isset($_SESSION['editor']['indent_guides']['text']) ? $_SESSION['editor']['indent_guides']["text"]: 'false';
+	$setting_numbering = isset($_SESSION['editor']['line_numbers']['text']) ? $_SESSION['editor']['line_numbers']["text"] : 'true';
 
 //create token
 	$object = new token;
diff --git a/app/system/system.php b/app/system/system.php
index f62ef381a3..ce51b6b116 100644
--- a/app/system/system.php
+++ b/app/system/system.php
@@ -49,9 +49,9 @@
 	if (permission_exists("system_view_support")) {
 		$setting_size = !empty($_SESSION["editor"]["font_size"]["text"]) ? $_SESSION["editor"]["font_size"]["text"] : '12px';
 		$setting_theme = !empty($_SESSION["editor"]["theme"]["text"]) ? $_SESSION["editor"]["theme"]["text"] : 'cobalt';
-		$setting_invisibles = filter_var($_SESSION["editor"]["invisibles"]["boolean"] ?? false, FILTER_VALIDATE_BOOL);
-		$setting_indenting = filter_var($_SESSION["editor"]["indent_guides"]["boolean"] ?? false, FILTER_VALIDATE_BOOL);
-		$setting_numbering = filter_var($_SESSION["editor"]["line_numbers"]["boolean"] ?? true, FILTER_VALIDATE_BOOL);
+		$setting_invisibles = isset($_SESSION['editor']['invisibles']['text']) ? $_SESSION['editor']['invisibles']["text"] : 'false';
+		$setting_indenting = isset($_SESSION['editor']['indent_guides']['text']) ? $_SESSION['editor']['indent_guides']["text"]: 'false';
+		$setting_numbering = isset($_SESSION['editor']['line_numbers']['text']) ? $_SESSION['editor']['line_numbers']["text"] : 'true';
 	}
 
 //additional includes
diff --git a/core/email_templates/email_template_edit.php b/core/email_templates/email_template_edit.php
index 0731ae638e..31c39e9cf2 100644
--- a/core/email_templates/email_template_edit.php
+++ b/core/email_templates/email_template_edit.php
@@ -180,9 +180,9 @@
 //load editor preferences/defaults
 	$setting_size = !empty($_SESSION["editor"]["font_size"]["text"]) ? $_SESSION["editor"]["font_size"]["text"] : '12px';
 	$setting_theme = !empty($_SESSION["editor"]["theme"]["text"]) ? $_SESSION["editor"]["theme"]["text"] : 'cobalt';
-	$setting_invisibles = filter_var($_SESSION["editor"]["invisibles"]["boolean"] ?? false, FILTER_VALIDATE_BOOL) ? 'true' : 'false';
-	$setting_indenting = filter_var($_SESSION["editor"]["indent_guides"]["boolean"] ?? false, FILTER_VALIDATE_BOOL) ? 'true' : 'false';
-	$setting_numbering = filter_var($_SESSION["editor"]["line_numbers"]["boolean"] ?? true, FILTER_VALIDATE_BOOL) ? 'true' : 'false';
+	$setting_invisibles = isset($_SESSION['editor']['invisibles']['text']) ? $_SESSION['editor']['invisibles']["text"] : 'false';
+	$setting_indenting = isset($_SESSION['editor']['indent_guides']['text']) ? $_SESSION['editor']['indent_guides']["text"]: 'false';
+	$setting_numbering = isset($_SESSION['editor']['line_numbers']['text']) ? $_SESSION['editor']['line_numbers']["text"] : 'true';
 
 //create token
 	$object = new token;