diff --git a/app/call_center/call_center_queue_edit.php b/app/call_center/call_center_queue_edit.php
index dbe021ec0f..fd204ede54 100644
--- a/app/call_center/call_center_queue_edit.php
+++ b/app/call_center/call_center_queue_edit.php
@@ -170,6 +170,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			//syncrhonize the configuration
 				save_call_center_xml();
 
+			//delete the dialplan context from memcache
+				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+				if ($fp) {
+					$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+				}
+
 			//redirect the user
 				require_once "includes/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=call_center_queues.php\">\n";
@@ -209,6 +216,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			//syncrhonize the configuration
 				save_call_center_xml();
 
+			//delete the dialplan context from memcache
+				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+				if ($fp) {
+					$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+				}
+
 			//redirect the user
 				require_once "includes/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=call_center_queue.php\">\n";
diff --git a/app/call_flows/call_flow_delete.php b/app/call_flows/call_flow_delete.php
index 8195a3f5e0..cccb609d65 100644
--- a/app/call_flows/call_flow_delete.php
+++ b/app/call_flows/call_flow_delete.php
@@ -77,6 +77,13 @@ if (strlen($id)>0) {
 
 	//apply settings reminder
 		$_SESSION["reload_xml"] = true;
+
+	//delete the dialplan context from memcache
+		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+		if ($fp) {
+			$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+			$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+		}
 }
 
 //redirect the user
diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php
index 268d3a06b4..49bc13590a 100644
--- a/app/call_flows/call_flow_edit.php
+++ b/app/call_flows/call_flow_edit.php
@@ -339,6 +339,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//apply settings reminder
 					$_SESSION["reload_xml"] = true;
 
+				//delete the dialplan context from memcache
+					$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+					if ($fp) {
+						$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+						$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+					}
+
 				//redirect the browser
 					require_once "includes/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=call_flows.php\">\n";
diff --git a/app/calls/resources/classes/switch_call_forward.php b/app/calls/resources/classes/switch_call_forward.php
index 0a6388402b..86dca350e9 100644
--- a/app/calls/resources/classes/switch_call_forward.php
+++ b/app/calls/resources/classes/switch_call_forward.php
@@ -87,7 +87,7 @@ include "root.php";
 			//delete extension from memcache
 				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
 				if ($fp) {
-					$switch_cmd .= "memcache delete directory:".$this->extension."@".$this->domain_name;
+					$switch_cmd = "memcache delete directory:".$this->extension."@".$this->domain_name;
 					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
 				}
 
diff --git a/app/calls/resources/classes/switch_do_not_disturb.php b/app/calls/resources/classes/switch_do_not_disturb.php
index 5c94c2ffd8..abb8232dfe 100644
--- a/app/calls/resources/classes/switch_do_not_disturb.php
+++ b/app/calls/resources/classes/switch_do_not_disturb.php
@@ -113,7 +113,7 @@ include "root.php";
 			//delete extension from memcache
 				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
 				if ($fp) {
-					$switch_cmd .= "memcache delete directory:".$this->extension."@".$this->domain_name;
+					$switch_cmd = "memcache delete directory:".$this->extension."@".$this->domain_name;
 					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
 				}
 
diff --git a/app/calls/resources/classes/switch_follow_me.php b/app/calls/resources/classes/switch_follow_me.php
index ab12c50bc9..ba7ed92e81 100644
--- a/app/calls/resources/classes/switch_follow_me.php
+++ b/app/calls/resources/classes/switch_follow_me.php
@@ -330,7 +330,7 @@ include "root.php";
 			//delete extension from memcache
 				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
 				if ($fp) {
-					$switch_cmd .= "memcache delete directory:".$this->extension."@".$this->domain_name;
+					$switch_cmd = "memcache delete directory:".$this->extension."@".$this->domain_name;
 					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
 				}
 
diff --git a/app/conference_centers/conference_center_delete.php b/app/conference_centers/conference_center_delete.php
index 720b4a5ac6..79940fd9e8 100644
--- a/app/conference_centers/conference_center_delete.php
+++ b/app/conference_centers/conference_center_delete.php
@@ -72,6 +72,13 @@ if (strlen($id)>0) {
 		$db->query($sql);
 		unset($sql);
 
+	//delete the dialplan context from memcache
+		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+		if ($fp) {
+			$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+			$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+		}
+
 	//syncrhonize configuration
 		save_dialplan_xml();
 
diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php
index a72e864e2b..302760065a 100644
--- a/app/conference_centers/conference_center_edit.php
+++ b/app/conference_centers/conference_center_edit.php
@@ -264,6 +264,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$sql .= "and dialplan_uuid = '$dialplan_uuid' ";
 					$db->query($sql);
 
+				//delete the dialplan context from memcache
+					$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+					if ($fp) {
+						$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+						$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+					}
+
 				//save the xml
 					save_dialplan_xml();
 
diff --git a/app/conferences/conference_delete.php b/app/conferences/conference_delete.php
index f67530a044..71bc27f21c 100644
--- a/app/conferences/conference_delete.php
+++ b/app/conferences/conference_delete.php
@@ -83,6 +83,14 @@ if (strlen($id)>0) {
 
 	//apply settings reminder
 		$_SESSION["reload_xml"] = true;
+
+	//delete the dialplan context from memcache
+		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+		if ($fp) {
+			$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+			$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+		}
+
 }
 
 //redirect the user
diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php
index 1f8b2a10eb..2b095322ab 100644
--- a/app/conferences/conference_edit.php
+++ b/app/conferences/conference_edit.php
@@ -217,20 +217,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$dialplan_detail_group = '2';
 					dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
 
-				//save the xml
-					save_dialplan_xml();
-
-				//apply settings reminder
-					$_SESSION["reload_xml"] = true;
-
-				//redirect the browser
-					require_once "includes/header.php";
-					echo "<meta http-equiv=\"refresh\" content=\"2;url=conferences.php\">\n";
-					echo "<div align='center'>\n";
-					echo "".$text['confirm-add']."\n";
-					echo "</div>\n";
-					require_once "includes/footer.php";
-					return;
 			} //if ($action == "add")
 
 			if ($action == "update") {
@@ -285,21 +271,30 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$sql .= "and dialplan_uuid = '$dialplan_uuid' ";
 					$db->query($sql);
 
-				//save the xml
-					save_dialplan_xml();
-
-				//apply settings reminder
-					$_SESSION["reload_xml"] = true;
-
-				//redirect the browser
-					require_once "includes/header.php";
-					echo "<meta http-equiv=\"refresh\" content=\"2;url=conferences.php\">\n";
-					echo "<div align='center'>\n";
-					echo "".$text['confirm-update']."\n";
-					echo "</div>\n";
-					require_once "includes/footer.php";
-					return;
 			} //if ($action == "update")
+
+			//save the xml
+				save_dialplan_xml();
+
+			//apply settings reminder
+				$_SESSION["reload_xml"] = true;
+
+			//delete the dialplan context from memcache
+				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+				if ($fp) {
+					$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+				}
+
+			//redirect the browser
+				require_once "includes/header.php";
+				echo "<meta http-equiv=\"refresh\" content=\"2;url=conferences.php\">\n";
+				echo "<div align='center'>\n";
+				echo "".$text['confirm-update']."\n";
+				echo "</div>\n";
+				require_once "includes/footer.php";
+				return;
+
 		} //if ($_POST["persistformvar"] != "true") 
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
diff --git a/app/dialplan/dialplan_add.php b/app/dialplan/dialplan_add.php
index a42c02aa57..00dea0f2f8 100644
--- a/app/dialplan/dialplan_add.php
+++ b/app/dialplan/dialplan_add.php
@@ -240,13 +240,21 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	//synchronize the xml config
 		save_dialplan_xml();
 
-	require_once "includes/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/app/dialplan/dialplans.php\">\n";
-	echo "<div align='center'>\n";
-	echo "Update Complete\n";
-	echo "</div>\n";
-	require_once "includes/footer.php";
-	return;
+	//delete the dialplan context from memcache
+		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+		if ($fp) {
+			$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+			$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+		}
+
+	//redirect the browser
+		require_once "includes/header.php";
+		echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/app/dialplan/dialplans.php\">\n";
+		echo "<div align='center'>\n";
+		echo "Update Complete\n";
+		echo "</div>\n";
+		require_once "includes/footer.php";
+		return;
 } //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
 ?><script type="text/javascript">
diff --git a/app/dialplan/dialplan_copy.php b/app/dialplan/dialplan_copy.php
index 7714dd9ffb..ef5e38b96d 100644
--- a/app/dialplan/dialplan_copy.php
+++ b/app/dialplan/dialplan_copy.php
@@ -136,6 +136,13 @@ else {
 	//synchronize the xml config
 		save_dialplan_xml();
 
+	//delete the dialplan context from memcache
+		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+		if ($fp) {
+			$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+			$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+		}
+
 	//redirect the user
 		require_once "includes/header.php";
 		switch ($app_uuid) {
diff --git a/app/dialplan/dialplan_delete.php b/app/dialplan/dialplan_delete.php
index 31b204342f..0388c63ffe 100644
--- a/app/dialplan/dialplan_delete.php
+++ b/app/dialplan/dialplan_delete.php
@@ -78,6 +78,13 @@ if (strlen($dialplan_uuid)>0) {
 
 	//synchronize the xml config
 		save_dialplan_xml();
+
+	//delete the dialplan context from memcache
+		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+		if ($fp) {
+			$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+			$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+		}
 }
 
 //redirect the user
diff --git a/app/dialplan/dialplan_details_delete.php b/app/dialplan/dialplan_details_delete.php
index cb87b16409..f86714560e 100644
--- a/app/dialplan/dialplan_details_delete.php
+++ b/app/dialplan/dialplan_details_delete.php
@@ -56,6 +56,12 @@ if (strlen($id)>0) {
 	//synchronize the xml config
 		save_dialplan_xml();
 
+	//delete the dialplan context from memcache
+		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+		if ($fp) {
+			$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+			$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+		}
 }
 
 //redirect the user
diff --git a/app/dialplan/dialplan_details_edit.php b/app/dialplan/dialplan_details_edit.php
index 7915390ee4..038b70decb 100644
--- a/app/dialplan/dialplan_details_edit.php
+++ b/app/dialplan/dialplan_details_edit.php
@@ -134,6 +134,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//synchronize the xml config
 				save_dialplan_xml();
 
+				//delete the dialplan context from memcache
+				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+				if ($fp) {
+					$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+				}
+
 				require_once "includes/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=dialplan_edit.php?id=".$dialplan_uuid."\">\n";
 				echo "<div align='center'>\n";
@@ -166,8 +173,14 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//synchronize the xml config
 				save_dialplan_xml();
 
-				require_once "includes/header.php";
+				//delete the dialplan context from memcache
+				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+				if ($fp) {
+					$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+				}
 
+				require_once "includes/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=dialplan_edit.php?id=".$dialplan_uuid."\">\n";
 				echo "<div align='center'>\n";
 				echo "Update Complete\n";
diff --git a/app/dialplan/dialplan_edit.php b/app/dialplan/dialplan_edit.php
index e6344481b8..e0ecf77b29 100644
--- a/app/dialplan/dialplan_edit.php
+++ b/app/dialplan/dialplan_edit.php
@@ -176,6 +176,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$db->exec(check_sql($sql));
 					unset($sql);
 
+				//delete the dialplan context from memcache
+					$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+					if ($fp) {
+						$switch_cmd = "memcache delete dialplan:".$dialplan_context."@".$_SESSION['domain_name'];
+						$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+					}
+
 				//synchronize the xml config
 					save_dialplan_xml();
 
diff --git a/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php
index 34683ee40a..62d3e90f34 100644
--- a/app/dialplan_inbound/dialplan_inbound_add.php
+++ b/app/dialplan_inbound/dialplan_inbound_add.php
@@ -563,6 +563,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	//commit the atomic transaction
 		$count = $db->exec("COMMIT;"); //returns affected rows
 
+	//delete the dialplan context from memcache
+		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+		if ($fp) {
+			$switch_cmd = "memcache delete dialplan:public@".$_SESSION['domain_name'];
+			$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+		}
+
 	//synchronize the xml config
 		save_dialplan_xml();
 
diff --git a/app/dialplan_outbound/dialplan_outbound_add.php b/app/dialplan_outbound/dialplan_outbound_add.php
index b56b908b61..d7fe45aea3 100644
--- a/app/dialplan_outbound/dialplan_outbound_add.php
+++ b/app/dialplan_outbound/dialplan_outbound_add.php
@@ -553,14 +553,15 @@ else {
 					unset($action_data);
 				} //if strlen
 			} //end for each
-
-			//synchronize the xml config
-				save_dialplan_xml();
-			
-			//changes in the dialplan may affect routes in the hunt groups
-				save_hunt_group_xml();
 		}
 
+		//delete the dialplan context from memcache
+			$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+			if ($fp) {
+				$switch_cmd = "memcache delete dialplan:".$dialplan_context."@".$_SESSION['domain_name'];
+				$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+			}
+
 		//synchronize the xml config
 			save_dialplan_xml();
 
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index dcf7bbef70..1cc89444b8 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -550,7 +550,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			//delete extension from memcache
 				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
 				if ($fp) {
-					$switch_cmd .= "memcache delete directory:".$extension."@".$_SESSION['domain_name'];
+					$switch_cmd = "memcache delete directory:".$extension."@".$_SESSION['domain_name'];
 					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
 				}
 
diff --git a/app/fax/fax_delete.php b/app/fax/fax_delete.php
index 06bb5fa9b1..62467ec84f 100644
--- a/app/fax/fax_delete.php
+++ b/app/fax/fax_delete.php
@@ -87,6 +87,13 @@ else {
 
 		//apply settings reminder
 			$_SESSION["reload_xml"] = true;
+
+		//delete the dialplan context from memcache
+			$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+			if ($fp) {
+				$switch_cmd .= "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+				$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+			}
 	}
 
 //redirect the user
diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php
index 5a5814df3a..9f2f445ebb 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_edit.php
@@ -124,12 +124,14 @@ else {
 		//set the variables
 			$user_uuid = check_str($_REQUEST["user_uuid"]);
 			$fax_uuid = check_str($_REQUEST["id"]);
+
 		//delete the group from the users
 			$sql = "delete from v_fax_users ";
 			$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
 			$sql .= "and fax_uuid = '".$fax_uuid."' ";
 			$sql .= "and user_uuid = '".$user_uuid."' ";
 			$db->exec(check_sql($sql));
+
 		//redirect the browser
 			require_once "includes/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=fax_edit.php?id=$fax_uuid\">\n";
@@ -159,6 +161,7 @@ else {
 			$sql_insert .= "'".$user_uuid."' ";
 			$sql_insert .= ")";
 			$db->exec($sql_insert);
+
 		//redirect the browser
 			require_once "includes/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=fax_edit.php?id=$fax_uuid\">\n";
@@ -453,6 +456,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			//apply settings reminder
 				$_SESSION["reload_xml"] = true;
 
+			//delete the dialplan context from memcache
+				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+				if ($fp) {
+					$switch_cmd .= "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+				}
+
 			//redirect the browser
 				require_once "includes/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=fax.php\">\n";
diff --git a/app/fifo/fifo_add.php b/app/fifo/fifo_add.php
index 3add464fe1..24da5b7040 100644
--- a/app/fifo/fifo_add.php
+++ b/app/fifo/fifo_add.php
@@ -247,6 +247,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	//synchronize the xml config
 		save_dialplan_xml();
 
+	//delete the dialplan context from memcache
+		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+		if ($fp) {
+			$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+			$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+		}
+
 	//redirect the user
 		require_once "includes/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"2;url=fifo.php\">\n";
diff --git a/app/fifo/fifo_delete.php b/app/fifo/fifo_delete.php
index e771a40dde..500881a309 100644
--- a/app/fifo/fifo_delete.php
+++ b/app/fifo/fifo_delete.php
@@ -67,6 +67,13 @@ if (strlen($id)>0) {
 
     //synchronize the xml config
 		save_dialplan_xml();
+
+	//delete the dialplan context from memcache
+		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+		if ($fp) {
+			$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+			$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+		}
 }
 
 //redirect the user
diff --git a/app/fifo/fifo_detail_delete.php b/app/fifo/fifo_detail_delete.php
index e15458c072..288481f1d8 100644
--- a/app/fifo/fifo_detail_delete.php
+++ b/app/fifo/fifo_detail_delete.php
@@ -41,15 +41,22 @@ if (count($_GET)>0) {
 
 if (strlen($id)>0) {
 	//delete the data
-		$sql = "";
-		$sql .= "delete from v_dialplan_details ";
+		$sql = "delete from v_dialplan_details ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
 		$sql .= "and dialplan_detail_uuid = '$id' ";
 		$sql .= "and dialplan_uuid = '$dialplan_uuid' ";
 		$db->query($sql);
 		unset($sql);
+
 	//synchronize the xml config
 		save_dialplan_xml();
+
+	//delete the dialplan context from memcache
+		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+		if ($fp) {
+			$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+			$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+		}
 }
 
 //redirect the user
diff --git a/app/fifo/fifo_detail_edit.php b/app/fifo/fifo_detail_edit.php
index 80baee3e6d..44ab7b9092 100644
--- a/app/fifo/fifo_detail_edit.php
+++ b/app/fifo/fifo_detail_edit.php
@@ -115,6 +115,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//synchronize the xml config
 				save_dialplan_xml();
 
+				//delete the dialplan context from memcache
+				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+				if ($fp) {
+					$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+				}
+
 				require_once "includes/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=fifo_edit.php?id=".$dialplan_uuid."\">\n";
 				echo "<div align='center'>\n";
@@ -140,6 +147,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//synchronize the xml config
 				save_dialplan_xml();
 
+				//delete the dialplan context from memcache
+				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+				if ($fp) {
+					$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+				}
+
 				require_once "includes/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=fifo_edit.php?id=".$dialplan_uuid."\">\n";
 				echo "<div align='center'>\n";
diff --git a/app/fifo/fifo_edit.php b/app/fifo/fifo_edit.php
index 8dd732aa75..177cb55fd0 100644
--- a/app/fifo/fifo_edit.php
+++ b/app/fifo/fifo_edit.php
@@ -120,6 +120,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//synchronize the xml config
 				save_dialplan_xml();
 
+				//delete the dialplan context from memcache
+				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+				if ($fp) {
+					$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+				}
+
 				require_once "includes/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=fifo.php\">\n";
 				echo "<div align='center'>\n";
@@ -146,6 +153,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//synchronize the xml config
 				save_dialplan_xml();
 
+				//delete the dialplan context from memcache
+				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+				if ($fp) {
+					$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+				}
+
 				require_once "includes/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=fifo.php\">\n";
 				echo "<div align='center'>\n";
diff --git a/app/gateways/gateway_delete.php b/app/gateways/gateway_delete.php
index 3b46e550b3..f252e740a1 100644
--- a/app/gateways/gateway_delete.php
+++ b/app/gateways/gateway_delete.php
@@ -40,8 +40,6 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-
-
 if (strlen($_GET["id"])>0) {
 	//set the variable
 		$id = check_str($_GET["id"]);
@@ -98,6 +96,13 @@ if (strlen($_GET["id"])>0) {
 	//synchronize the xml config
 		save_dialplan_xml();
 
+	//delete the gateways from memcache
+		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+		if ($fp) {
+			$switch_cmd = "memcache delete configuration:sofia.conf";
+			$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+		}
+
 	//rescan the sip profile to look for new or stopped gateways
 		//create the event socket connection and send a command
 			if (!$fp) {
diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php
index dc1c4460a3..c0f472e37f 100644
--- a/app/gateways/gateway_edit.php
+++ b/app/gateways/gateway_edit.php
@@ -240,6 +240,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			//synchronize the xml config
 				save_dialplan_xml();
 
+			//delete the sip profiles from memcache
+				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+				if ($fp) {
+					$switch_cmd = "memcache delete configuration:sofia.conf";
+					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+				}
+
 			//rescan the external profile to look for new or stopped gateways
 				//create the event socket connection
 					$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
diff --git a/app/hot_desking/extension_delete.php b/app/hot_desking/extension_delete.php
index 12fb0aeb57..bfb20da86b 100644
--- a/app/hot_desking/extension_delete.php
+++ b/app/hot_desking/extension_delete.php
@@ -35,7 +35,7 @@ else {
 }
 
 if (count($_GET)>0) {
-	$id = $_GET["id"];
+	$id = check_str($_GET["id"]);
 }
 
 //delete the extension
@@ -52,6 +52,25 @@ if (count($_GET)>0) {
 		unset($prep_statement, $sql);
 	}
 
+//get the extension
+	$sql = "select * from v_extensions ";
+	$sql .= "where domain_uuid = '$domain_uuid' ";
+	$sql .= "and extension_uuid = '$id' ";
+	$prep_statement = $db->prepare(check_sql($sql));
+	$prep_statement->execute();
+	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+	foreach ($result as &$row) {
+		$extension = $row["extension"];
+	}
+	unset ($prep_statement);
+
+//delete extension from memcache
+	$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+	if ($fp) {
+		$switch_cmd = "memcache delete directory:".$extension."@".$_SESSION['domain_name'];
+		$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+	}
+
 //redirect the user
 	require_once "includes/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=index.php\">\n";
diff --git a/app/hot_desking/extension_edit.php b/app/hot_desking/extension_edit.php
index 451a2131a0..aa7f8b89f5 100644
--- a/app/hot_desking/extension_edit.php
+++ b/app/hot_desking/extension_edit.php
@@ -109,6 +109,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 			}
+
 		//update the extension
 			if ($action == "update" && permission_exists('extension_edit')) {
 				$sql = "update v_extensions set ";
@@ -124,6 +125,26 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 			}
+
+		//get the extension
+			$sql = "select * from v_extensions ";
+			$sql .= "where domain_uuid = '$domain_uuid' ";
+			$sql .= "and extension_uuid = '$extension_uuid' ";
+			$prep_statement = $db->prepare(check_sql($sql));
+			$prep_statement->execute();
+			$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+			foreach ($result as &$row) {
+				$extension = $row["extension"];
+			}
+			unset ($prep_statement);
+
+		//delete extension from memcache
+			$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+			if ($fp) {
+				$switch_cmd = "memcache delete directory:".$extension."@".$_SESSION['domain_name'];
+				$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+			}
+
 		//show the action and redirect the user
 			require_once "includes/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=index.php\">\n";
@@ -166,7 +187,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$password = $row["password"];
 			$vm_password = $row["vm_password"];
 			$vm_password = str_replace("#", "", $vm_password); //preserves leading zeros
-
 		}
 		unset ($prep_statement);
 	}
diff --git a/app/hunt_group/hunt_group_delete.php b/app/hunt_group/hunt_group_delete.php
index 588faacf70..f07a6958d1 100644
--- a/app/hunt_group/hunt_group_delete.php
+++ b/app/hunt_group/hunt_group_delete.php
@@ -91,6 +91,13 @@ if (strlen($id)>0) {
 	//synchronize the xml config
 		save_hunt_group_xml();
 
+	//delete the dialplan context from memcache
+		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+		if ($fp) {
+			$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+			$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+		}
+
 }
 
 //redirect the user
diff --git a/app/hunt_group/hunt_group_edit.php b/app/hunt_group/hunt_group_edit.php
index d8e9533ea5..137fc99b88 100644
--- a/app/hunt_group/hunt_group_edit.php
+++ b/app/hunt_group/hunt_group_edit.php
@@ -254,6 +254,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//synchronize the xml config
 					save_hunt_group_xml();
 
+				//delete the dialplan context from memcache
+					$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+					if ($fp) {
+						$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+						$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+					}
+
 				//rediret the user
 					require_once "includes/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=hunt_groups.php\">\n";
diff --git a/app/ivr_menu/ivr_menu_edit.php b/app/ivr_menu/ivr_menu_edit.php
index 88f10cee25..95d1e562cb 100644
--- a/app/ivr_menu/ivr_menu_edit.php
+++ b/app/ivr_menu/ivr_menu_edit.php
@@ -208,31 +208,23 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 					//synchronize the xml config
 						save_dialplan_xml();
-
-					//redirect the user
-						require_once "includes/header.php";
-						echo "<meta http-equiv=\"refresh\" content=\"2;url=ivr_menus.php\">\n";
-						echo "<div align='center'>\n";
-						echo "Add Complete\n";
-						echo "</div>\n";
-						require_once "includes/footer.php";
-						return;
 				}
+
 			//update the data
 				if ($action == "update" && permission_exists('ivr_menu_edit')) {
 					//run the update method in the ivr menu class
-						$ivr->ivr_menu_uuid = $ivr_menu_uuid;
-						$ivr->update();
-
-					//redirect the user
-						require_once "includes/header.php";
-						echo "<meta http-equiv=\"refresh\" content=\"2;url=ivr_menus.php\">\n";
-						echo "<div align='center'>\n";
-						echo "Update Complete\n";
-						echo "</div>\n";
-						require_once "includes/footer.php";
-						return;
+					$ivr->ivr_menu_uuid = $ivr_menu_uuid;
+					$ivr->update();
 				}
+
+			//redirect the user
+				require_once "includes/header.php";
+				echo "<meta http-equiv=\"refresh\" content=\"2;url=ivr_menus.php\">\n";
+				echo "<div align='center'>\n";
+				echo "Update Complete\n";
+				echo "</div>\n";
+				require_once "includes/footer.php";
+				return;
 		} //if ($_POST["persistformvar"] != "true")
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
diff --git a/app/ivr_menu/resources/classes/switch_ivr_menu.php b/app/ivr_menu/resources/classes/switch_ivr_menu.php
index cc3fa22729..308a27e28a 100644
--- a/app/ivr_menu/resources/classes/switch_ivr_menu.php
+++ b/app/ivr_menu/resources/classes/switch_ivr_menu.php
@@ -346,6 +346,13 @@ require_once "includes/classes/switch_dialplan.php";
 					$database->fields['ivr_menu_option_description'] = $this->ivr_menu_option_description;
 					$database->add();
 				}
+
+			//delete the dialplan context from memcache
+				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+				if ($fp) {
+					$switch_cmd .= "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+				}
 		}
 
 		public function update() {
@@ -690,25 +697,32 @@ require_once "includes/classes/switch_dialplan.php";
 								$database->delete();
 						}
 
-						//delete child data
-							$database->table = "v_ivr_menu_options";
-							$database->where[0]['name'] = 'domain_uuid';
-							$database->where[0]['value'] = $this->domain_uuid;
-							$database->where[0]['operator'] = '=';
-							$database->where[1]['name'] = 'ivr_menu_uuid';
-							$database->where[1]['value'] = $this->ivr_menu_uuid;
-							$database->where[1]['operator'] = '=';
-							$database->delete();
+					//delete child data
+						$database->table = "v_ivr_menu_options";
+						$database->where[0]['name'] = 'domain_uuid';
+						$database->where[0]['value'] = $this->domain_uuid;
+						$database->where[0]['operator'] = '=';
+						$database->where[1]['name'] = 'ivr_menu_uuid';
+						$database->where[1]['value'] = $this->ivr_menu_uuid;
+						$database->where[1]['operator'] = '=';
+						$database->delete();
 
-						//delete parent data
-							$database->table = "v_ivr_menus";
-							$database->where[0]['name'] = 'domain_uuid';
-							$database->where[0]['value'] = $this->domain_uuid;
-							$database->where[0]['operator'] = '=';
-							$database->where[1]['name'] = 'ivr_menu_uuid';
-							$database->where[1]['value'] = $this->ivr_menu_uuid;
-							$database->where[1]['operator'] = '=';
-							$database->delete();
+					//delete parent data
+						$database->table = "v_ivr_menus";
+						$database->where[0]['name'] = 'domain_uuid';
+						$database->where[0]['value'] = $this->domain_uuid;
+						$database->where[0]['operator'] = '=';
+						$database->where[1]['name'] = 'ivr_menu_uuid';
+						$database->where[1]['value'] = $this->ivr_menu_uuid;
+						$database->where[1]['operator'] = '=';
+						$database->delete();
+
+					//delete the dialplan context from memcache
+						$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+						if ($fp) {
+							$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+							$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+						}
 
 					//commit the transaction
 						//$count = $database->db->exec("COMMIT;");
diff --git a/app/ring_groups/ring_groups_delete.php b/app/ring_groups/ring_groups_delete.php
index 9440dcadcf..4bdb506a5e 100644
--- a/app/ring_groups/ring_groups_delete.php
+++ b/app/ring_groups/ring_groups_delete.php
@@ -59,28 +59,40 @@ else {
 				$dialplan_uuid = $row["dialplan_uuid"];
 			}
 			unset ($prep_statement);
+
 		//delete from the ring groups table
 			$sql = "delete from v_ring_groups ";
 			$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
 			$sql .= "and ring_group_uuid = '".$id."' ";
 			$db->exec(check_sql($sql));
 			unset($sql);
+
 		//delete from the ring group extensions table
 			$sql = "delete from v_ring_group_extensions ";
 			$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
 			$sql .= "and ring_group_uuid = '".$id."' ";
 			$db->exec(check_sql($sql));
 			unset($sql);
+
 		//delete from the dialplan
 			$sql = "delete from v_dialplans ";
 			$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
 			$sql .= "and dialplan_uuid = '".$dialplan_uuid."' ";
 			$db->exec(check_sql($sql));
 			unset($sql);
+
 		//save the xml
 			save_dialplan_xml();
+
 		//apply settings reminder
 			$_SESSION["reload_xml"] = true;
+
+		//delete the dialplan context from memcache
+			$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+			if ($fp) {
+				$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+				$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+			}
 	}
 
 //redirect the user
diff --git a/app/ring_groups/ring_groups_edit.php b/app/ring_groups/ring_groups_edit.php
index 0a01d380bf..844bd5d407 100644
--- a/app/ring_groups/ring_groups_edit.php
+++ b/app/ring_groups/ring_groups_edit.php
@@ -273,6 +273,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 						}
 					}
 
+				//delete the dialplan context from memcache
+					$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+					if ($fp) {
+						$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+						$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+					}
+
 				//redirect the browser
 					require_once "includes/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=ring_groups_edit.php?id=$ring_group_uuid\">\n";
diff --git a/app/sip_profiles/sip_profiles_delete.php b/app/sip_profiles/sip_profiles_delete.php
index c1387183bc..53af4e4828 100644
--- a/app/sip_profiles/sip_profiles_delete.php
+++ b/app/sip_profiles/sip_profiles_delete.php
@@ -63,6 +63,12 @@ if (strlen($id)>0) {
 	//apply settings reminder
 		$_SESSION["reload_xml"] = true;
 
+	//delete the sip profiles from memcache
+		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+		if ($fp) {
+			$switch_cmd = "memcache delete configuration:sofia.conf";
+			$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+		}
 }
 
 //redirect the browser
diff --git a/app/sip_profiles/sip_profiles_edit.php b/app/sip_profiles/sip_profiles_edit.php
index 438bbd1a2f..d7941bc47f 100644
--- a/app/sip_profiles/sip_profiles_edit.php
+++ b/app/sip_profiles/sip_profiles_edit.php
@@ -74,39 +74,42 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	//add or update the database
 		if ($_POST["persistformvar"] != "true") {
-			if ($action == "add") {
-				$sql = "insert into v_sip_profiles ";
-				$sql .= "(";
-				$sql .= "sip_profile_uuid, ";
-				$sql .= "sip_profile_name, ";
-				$sql .= "sip_profile_description ";
-				$sql .= ")";
-				$sql .= "values ";
-				$sql .= "(";
-				$sql .= "'".uuid()."', ";
-				$sql .= "'$sip_profile_name', ";
-				$sql .= "'$sip_profile_description' ";
-				$sql .= ")";
-				$db->exec(check_sql($sql));
-				unset($sql);
+			//add the sip profile
+				if ($action == "add") {
+					$sql = "insert into v_sip_profiles ";
+					$sql .= "(";
+					$sql .= "sip_profile_uuid, ";
+					$sql .= "sip_profile_name, ";
+					$sql .= "sip_profile_description ";
+					$sql .= ")";
+					$sql .= "values ";
+					$sql .= "(";
+					$sql .= "'".uuid()."', ";
+					$sql .= "'$sip_profile_name', ";
+					$sql .= "'$sip_profile_description' ";
+					$sql .= ")";
+					$db->exec(check_sql($sql));
+					unset($sql);
+				} //if ($action == "add")
 
-				require_once "includes/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=sip_profiles.php\">\n";
-				echo "<div align='center'>\n";
-				echo "Add Complete\n";
-				echo "</div>\n";
-				require_once "includes/footer.php";
-				return;
-			} //if ($action == "add")
+			//update the sip profile
+				if ($action == "update") {
+					$sql = "update v_sip_profiles set ";
+					$sql .= "sip_profile_name = '$sip_profile_name', ";
+					$sql .= "sip_profile_description = '$sip_profile_description' ";
+					$sql .= "where sip_profile_uuid = '$sip_profile_uuid'";
+					$db->exec(check_sql($sql));
+					unset($sql);
+				} //if ($action == "update")
 
-			if ($action == "update") {
-				$sql = "update v_sip_profiles set ";
-				$sql .= "sip_profile_name = '$sip_profile_name', ";
-				$sql .= "sip_profile_description = '$sip_profile_description' ";
-				$sql .= "where sip_profile_uuid = '$sip_profile_uuid'";
-				$db->exec(check_sql($sql));
-				unset($sql);
+			//delete the sip profiles from memcache
+				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+				if ($fp) {
+					$switch_cmd = "memcache delete configuration:sofia.conf";
+					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+				}
 
+			//redirect the browser
 				require_once "includes/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=sip_profiles.php\">\n";
 				echo "<div align='center'>\n";
@@ -114,7 +117,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				echo "</div>\n";
 				require_once "includes/footer.php";
 				return;
-			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true") 
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
diff --git a/app/time_conditions/time_condition_add.php b/app/time_conditions/time_condition_add.php
index b4a4a80998..9a344bcbfe 100644
--- a/app/time_conditions/time_condition_add.php
+++ b/app/time_conditions/time_condition_add.php
@@ -475,13 +475,21 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	//synchronize the xml config
 		save_dialplan_xml();
 
-	require_once "includes/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=4b821450-926b-175a-af93-a03c441818b1\">\n";
-	echo "<div align='center'>\n";
-	echo "".$text['confirm-update-complete']."\n";
-	echo "</div>\n";
-	require_once "includes/footer.php";
-	return;
+	//delete the dialplan context from memcache
+		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+		if ($fp) {
+			$switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name'];
+			$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+		}
+
+	//redirect the browser
+		require_once "includes/header.php";
+		echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=4b821450-926b-175a-af93-a03c441818b1\">\n";
+		echo "<div align='center'>\n";
+		echo "".$text['confirm-update-complete']."\n";
+		echo "</div>\n";
+		require_once "includes/footer.php";
+		return;
 
 } //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
diff --git a/includes/classes/switch_directory.php b/includes/classes/switch_directory.php
index 61a7d74f84..f067a4dbc9 100644
--- a/includes/classes/switch_directory.php
+++ b/includes/classes/switch_directory.php
@@ -386,13 +386,13 @@ include "root.php";
 
 		function generate_xml($single=1){
 			//switch_account_code!! How should we be passing this??
-			
+
 			if ($this->enabled== "false" || !$this->enabled) {
 				return false;//This the best way??
 			}
-			
+
 			$this->vm_password = str_replace("#", "", $this->vm_password); //preserves leading zeros//**Generic Validation!
-			
+
 			/*if(!in_array($this->vm_enabled,array("false","true"))) {//**Generic Validation!
 				$this->vm_enabled = "true";
 			}