diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index ab8e6e8e54..a0c7b5d1da 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -670,6 +670,7 @@ function services_dnsmasq_configure() {
 		}
 
 		/* Allow DNS Rebind for forwarded domains */
+		if(!isset($config['system']['webgui']['nodnsrebindcheck'])) {
 		if (isset($config['dnsmasq']['domainoverrides']) && is_array($config['dnsmasq']['domainoverrides'])) {
 			if(!isset($config['system']['webgui']['nodnsrebindcheck'])) {
 				foreach($config['dnsmasq']['domainoverrides'] as $override) {
diff --git a/usr/local/www/edit.php b/usr/local/www/edit.php
index 6b71ad2ecd..6867a84077 100644
--- a/usr/local/www/edit.php
+++ b/usr/local/www/edit.php
@@ -138,7 +138,7 @@ outputJavaScriptFileInline("filebrowser/browser.js");
 			"<?=$_SERVER['SCRIPT_NAME'];?>", {
 				method:     "post",
 				postBody:   "action=save&file=" + $("fbTarget").value +
-							"&data=" + fileContent,
+							"&data=" + escape(fileContent),
 				onComplete: function(req) {
 					var values = req.responseText.split("|");
 					$("fileStatus").innerHTML = values[1];
diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php
index 4cdf06500c..e7ae2978ec 100644
--- a/usr/local/www/system_advanced_admin.php
+++ b/usr/local/www/system_advanced_admin.php
@@ -189,6 +189,8 @@ if ($_POST) {
 
 		conf_mount_rw();
 		setup_serial_port();
+		// Restart dnsmasq in case dns rebinding toggled
+		services_dnsmasq_configure();
 		conf_mount_ro();
 	}
 }