diff --git a/app/gateways/gateways.php b/app/gateways/gateways.php
index 5aa10fd0ae..bfda610cb3 100644
--- a/app/gateways/gateways.php
+++ b/app/gateways/gateways.php
@@ -70,14 +70,14 @@
 					$obj->delete($gateways);
 				}
 			case 'start':
-				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+				$fp = event_socket_create();
 				if ($fp && permission_exists('gateway_edit')) {
 					$obj = new gateways;
 					$obj->start($gateways);
 				}
 				break;
 			case 'stop':
-				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+				$fp = event_socket_create();
 				if ($fp && permission_exists('gateway_edit')) {
 					$obj = new gateways;
 					$obj->stop($gateways);
@@ -90,14 +90,14 @@
 	}
 
 //connect to event socket
-	$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+	$fp = event_socket_create();
 
 //gateway status function
 	if (!function_exists('switch_gateway_status')) {
 		function switch_gateway_status($gateway_uuid, $result_type = 'xml') {
 			global $fp;
 			if ($fp) {
-				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+				$fp = event_socket_create();
 				$cmd = 'api sofia xmlstatus gateway '.$gateway_uuid;
 				$response = trim(event_socket_request($fp, $cmd));
 				if ($response == "Invalid Gateway!") {
@@ -388,4 +388,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/registrations/resources/classes/registrations.php b/app/registrations/resources/classes/registrations.php
index 82b832fd8b..e5497e6358 100644
--- a/app/registrations/resources/classes/registrations.php
+++ b/app/registrations/resources/classes/registrations.php
@@ -60,7 +60,7 @@ if (!class_exists('registrations')) {
 				$id = 0;
 
 			//create the event socket connection
-				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+				$fp = event_socket_create();
 
 			//get the default settings
 				$sql = "select sip_profile_name from v_sip_profiles ";
@@ -269,7 +269,7 @@ if (!class_exists('registrations')) {
 							unset($sql);
 
 						//create the event socket connection
-							$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+							$fp = event_socket_create();
 
 						//loop through registrations
 							if ($fp) {
diff --git a/app/switch/resources/dashboard/switch_status.php b/app/switch/resources/dashboard/switch_status.php
index a88e9566fe..b5275e8077 100644
--- a/app/switch/resources/dashboard/switch_status.php
+++ b/app/switch/resources/dashboard/switch_status.php
@@ -26,7 +26,7 @@
 	$row_style["1"] = "row_style1";
 
 //connect to event socket
-	$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+	$fp = event_socket_create();
 
 //switch version
 	if (permission_exists('switch_version') && $fp) {
diff --git a/app/system/system.php b/app/system/system.php
index e9312a541e..b4618ba5d8 100644
--- a/app/system/system.php
+++ b/app/system/system.php
@@ -144,7 +144,7 @@
 		echo "	</td>\n";
 		echo "</tr>\n";
 
-		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+		$fp = event_socket_create();
 		if ($fp) {
 			$switch_version = event_socket_request($fp, 'api version');
 			preg_match("/FreeSWITCH Version (\d+\.\d+\.\d+(?:\.\d+)?).*\(.*?(\d+\w+)\s*\)/", $switch_version, $matches);
@@ -544,7 +544,7 @@
 		$memcache_fail = false;
 		$mod = new modules;
 		if ($mod -> active("mod_memcache")) {
-			$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+			$fp = event_socket_create();
 			if ($fp) {
 				$switch_cmd = "memcache status verbose";
 				$switch_result = event_socket_request($fp, 'api '.$switch_cmd);