diff --git a/app/settings/setting_edit.php b/app/settings/setting_edit.php
index 722da18a4e..683e138006 100644
--- a/app/settings/setting_edit.php
+++ b/app/settings/setting_edit.php
@@ -17,23 +17,27 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
+	Portions created by the Initial Developer are Copyright (C) 2008-2018
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 	James Rose <james.o.rose@gmail.com>
 */
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists('setting_view') || if_group("superadmin")) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
+
+//includes
+	include "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists('setting_view') || if_group("superadmin")) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
 
 //add multi-lingual support
 	$language = new text;
@@ -71,6 +75,7 @@ else {
 		if (strlen($event_socket_ip_address) == 0) { $event_socket_ip_address = '127.0.0.1'; }
 		$event_socket_port = check_str($_POST["event_socket_port"]);
 		$event_socket_password = check_str($_POST["event_socket_password"]);
+		$event_socket_acl = check_str($_POST["event_socket_acl"]);
 		$xml_rpc_http_port = check_str($_POST["xml_rpc_http_port"]);
 		$xml_rpc_auth_realm = check_str($_POST["xml_rpc_auth_realm"]);
 		$xml_rpc_auth_user = check_str($_POST["xml_rpc_auth_user"]);
@@ -88,6 +93,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($default_gateway) == 0) { $msg .= "Please provide: Default Gateway<br>\n"; }
 		if (strlen($event_socket_port) == 0) { $msg .= "Please provide: Event Socket Port<br>\n"; }
 		if (strlen($event_socket_password) == 0) { $msg .= "Please provide: Event Socket Password<br>\n"; }
+		//if (strlen($event_socket_acl) == 0) { $msg .= "Please provide: Event Socket ACL<br>\n"; }
 		//if (strlen($xml_rpc_http_port) == 0) { $msg .= "Please provide: XML RPC HTTP Port<br>\n"; }
 		//if (strlen($xml_rpc_auth_realm) == 0) { $msg .= "Please provide: XML RPC Auth Realm<br>\n"; }
 		//if (strlen($xml_rpc_auth_user) == 0) { $msg .= "Please provide: XML RPC Auth User<br>\n"; }
@@ -116,6 +122,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$sql .= "event_socket_ip_address, ";
 				$sql .= "event_socket_port, ";
 				$sql .= "event_socket_password, ";
+				$sql .= "event_socket_acl, ";
 				$sql .= "xml_rpc_http_port, ";
 				$sql .= "xml_rpc_auth_realm, ";
 				$sql .= "xml_rpc_auth_user, ";
@@ -128,6 +135,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$sql .= "'$event_socket_ip_address', ";
 				$sql .= "'$event_socket_port', ";
 				$sql .= "'$event_socket_password', ";
+				$sql .= "'$event_socket_acl', ";
 				$sql .= "'$xml_rpc_http_port', ";
 				$sql .= "'$xml_rpc_auth_realm', ";
 				$sql .= "'$xml_rpc_auth_user', ";
@@ -151,6 +159,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$sql .= "event_socket_ip_address = '$event_socket_ip_address', ";
 				$sql .= "event_socket_port = '$event_socket_port', ";
 				$sql .= "event_socket_password = '$event_socket_password', ";
+				$sql .= "event_socket_acl = '$event_socket_acl', ";
 				$sql .= "xml_rpc_http_port = '$xml_rpc_http_port', ";
 				$sql .= "xml_rpc_auth_realm = '$xml_rpc_auth_realm', ";
 				$sql .= "xml_rpc_auth_user = '$xml_rpc_auth_user', ";
@@ -182,6 +191,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$event_socket_ip_address = $row["event_socket_ip_address"];
 				$event_socket_port = $row["event_socket_port"];
 				$event_socket_password = $row["event_socket_password"];
+				$event_socket_acl = $row["event_socket_acl"];
 				$xml_rpc_http_port = $row["xml_rpc_http_port"];
 				$xml_rpc_auth_realm = $row["xml_rpc_auth_realm"];
 				$xml_rpc_auth_user = $row["xml_rpc_auth_user"];
@@ -248,6 +258,17 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
+	echo "    ".$text['label-event_socket_acl']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "    <input class='formfld' type='text' name='event_socket_acl' id='event_socket_acl' maxlength='50' value=\"".escape($event_socket_acl)."\">\n";
+	echo "<br />\n";
+	echo $text['description-event_socket_acl']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
 	echo "    ".$text['label-xml-rpc-port']."\n";