diff --git a/app/call_flows/call_flow_delete.php b/app/call_flows/call_flow_delete.php
index 6a6158d632..8ff8be9ceb 100644
--- a/app/call_flows/call_flow_delete.php
+++ b/app/call_flows/call_flow_delete.php
@@ -87,8 +87,8 @@
 			$p = new permissions;
 			$p->add('dialplan_detail_delete', 'temp');
 
-			$array['dialplans'][0]['dialplan_uuid'] = $dialplan_uuid;
-			$array['dialplans'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
+			$array['dialplan_details'][0]['dialplan_uuid'] = $dialplan_uuid;
+			$array['dialplan_details'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
 			$database = new database;
 			$database->app_name = 'call_flows';
 			$database->app_uuid = 'b1b70f85-6b42-429b-8c5a-60c8b02b7d14';
diff --git a/app/call_flows/resources/classes/call_flows.php b/app/call_flows/resources/classes/call_flows.php
index 42a1bbdc84..681802f834 100644
--- a/app/call_flows/resources/classes/call_flows.php
+++ b/app/call_flows/resources/classes/call_flows.php
@@ -68,17 +68,50 @@ if (!class_exists('call_flows')) {
 				//delete multiple records
 					if (is_array($records) && @sizeof($records) != 0) {
 
-						//build the delete array
+						//filter out unchecked call flows, build where clause for below
 							foreach($records as $x => $record) {
 								if ($record['checked'] == 'true' && is_uuid($record['uuid'])) {
-									$array[$this->table][$x][$this->uuid_prefix.'uuid'] = $record['uuid'];
-									$array[$this->table][$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+									$uuids[] = "'".$record['uuid']."'";
 								}
 							}
 
+						//get necessary call flow details
+							if (is_array($uuids) && @sizeof($uuids) != 0) {
+								$sql = "select ".$this->uuid_prefix."uuid as uuid, dialplan_uuid, call_flow_context from v_".$this->table." ";
+								$sql .= "where domain_uuid = :domain_uuid ";
+								$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
+								$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+								$database = new database;
+								$rows = $database->select($sql, $parameters, 'all');
+								if (is_array($rows) && @sizeof($rows) != 0) {
+									foreach ($rows as $row) {
+										$call_flows[$row['uuid']]['dialplan_uuid'] = $row['dialplan_uuid'];
+										$call_flow_contexts[] = $row['call_flow_context'];
+									}
+								}
+								unset($sql, $parameters, $rows, $row);
+							}
+
+						//build the delete array
+							$x = 0;
+							foreach ($call_flows as $call_flow_uuid => $call_flow) {
+								$array[$this->table][$x][$this->uuid_prefix.'uuid'] = $call_flow_uuid;
+								$array[$this->table][$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+								$array['dialplans'][$x]['dialplan_uuid'] = $call_flow['dialplan_uuid'];
+								$array['dialplans'][$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+								$array['dialplan_details'][$x]['dialplan_uuid'] = $call_flow['dialplan_uuid'];
+								$array['dialplan_details'][$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+								$x++;
+							}
+
 						//delete the checked rows
 							if (is_array($array) && @sizeof($array) != 0) {
 
+								//grant temporary permissions
+									$p = new permissions;
+									$p->add('dialplan_delete', 'temp');
+									$p->add('dialplan_detail_delete', 'temp');
+
 								//execute delete
 									$database = new database;
 									$database->app_name = $this->app_name;
@@ -86,6 +119,25 @@ if (!class_exists('call_flows')) {
 									$database->delete($array);
 									unset($array);
 
+								//revoke temporary permissions
+									$p->delete('dialplan_delete', 'temp');
+									$p->delete('dialplan_detail_delete', 'temp');
+
+								//syncrhonize configuration
+									save_dialplan_xml();
+
+								//apply settings reminder
+									$_SESSION["reload_xml"] = true;
+
+								//clear the cache
+									if (is_array($call_flow_contexts) && @sizeof($call_flow_contexts) != 0) {
+										$call_flow_contexts = array_unique($call_flow_contexts);
+										$cache = new cache;
+										foreach ($call_flow_contexts as $call_flow_context) {
+											$cache->delete("dialplan:".$call_flow_context);
+										}
+									}
+
 								//set message
 									message::add($text['message-delete']);
 							}
@@ -122,7 +174,7 @@ if (!class_exists('call_flows')) {
 								}
 							}
 							if (is_array($uuids) && @sizeof($uuids) != 0) {
-								$sql = "select ".$this->uuid_prefix."uuid as uuid, ".$this->toggle_field." as toggle from v_".$this->table." ";
+								$sql = "select ".$this->uuid_prefix."uuid as uuid, ".$this->toggle_field." as toggle, dialplan_uuid, call_flow_context from v_".$this->table." ";
 								$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
 								$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
 								$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
@@ -130,7 +182,9 @@ if (!class_exists('call_flows')) {
 								$rows = $database->select($sql, $parameters, 'all');
 								if (is_array($rows) && @sizeof($rows) != 0) {
 									foreach ($rows as $row) {
-										$states[$row['uuid']] = $row['toggle'];
+										$call_flows[$row['uuid']]['state'] = $row['toggle'];
+										$call_flows[$row['uuid']]['dialplan_uuid'] = $row['dialplan_uuid'];
+										$call_flow_contexts[] = $row['call_flow_context'];
 									}
 								}
 								unset($sql, $parameters, $rows, $row);
@@ -138,15 +192,21 @@ if (!class_exists('call_flows')) {
 
 						//build update array
 							$x = 0;
-							foreach($states as $uuid => $state) {
+							foreach($call_flows as $uuid => $call_flow) {
 								$array[$this->table][$x][$this->uuid_prefix.'uuid'] = $uuid;
-								$array[$this->table][$x][$this->toggle_field] = $state == $this->toggle_values[0] ? $this->toggle_values[1] : $this->toggle_values[0];
+								$array[$this->table][$x][$this->toggle_field] = $call_flow['state'] == $this->toggle_values[0] ? $this->toggle_values[1] : $this->toggle_values[0];
+								$array['dialplans'][$x]['dialplan_uuid'] = $call_flow['dialplan_uuid'];
+								$array['dialplans'][$x]['dialplan_enabled'] = $call_flow['state'] == $this->toggle_values[0] ? $this->toggle_values[1] : $this->toggle_values[0];
 								$x++;
 							}
 
 						//save the changes
 							if (is_array($array) && @sizeof($array) != 0) {
 
+								//grant temporary permissions
+									$p = new permissions;
+									$p->add('dialplan_edit', 'temp');
+
 								//save the array
 									$database = new database;
 									$database->app_name = $this->app_name;
@@ -154,10 +214,28 @@ if (!class_exists('call_flows')) {
 									$database->save($array);
 									unset($array);
 
+								//revoke temporary permissions
+									$p->delete('dialplan_edit', 'temp');
+
+								//syncrhonize configuration
+									save_dialplan_xml();
+
+								//apply settings reminder
+									$_SESSION["reload_xml"] = true;
+
+								//clear the cache
+									if (is_array($call_flow_contexts) && @sizeof($call_flow_contexts) != 0) {
+										$call_flow_contexts = array_unique($call_flow_contexts);
+										$cache = new cache;
+										foreach ($call_flow_contexts as $call_flow_context) {
+											$cache->delete("dialplan:".$call_flow_context);
+										}
+									}
+
 								//set message
 									message::add($text['message-toggle']);
 							}
-							unset($records, $states);
+							unset($records, $call_flows);
 					}
 
 			}
@@ -193,30 +271,62 @@ if (!class_exists('call_flows')) {
 
 						//create insert array from existing data
 							if (is_array($uuids) && @sizeof($uuids) != 0) {
-								$sql = "select * from v_".$this->table." ";
-								$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
-								$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
-								$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-								$database = new database;
-								$rows = $database->select($sql, $parameters, 'all');
-								if (is_array($rows) && @sizeof($rows) != 0) {
-									foreach ($rows as $x => $row) {
 
-										//copy data
-											$array[$this->table][$x] = $row;
+								//primary table
+									$sql = "select * from v_".$this->table." ";
+									$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
+									$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
+									$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+									$database = new database;
+									$rows = $database->select($sql, $parameters, 'all');
+									if (is_array($rows) && @sizeof($rows) != 0) {
+										foreach ($rows as $x => $row) {
+											$new_call_flow_uuid = uuid();
+											$new_dialplan_uuid = uuid();
 
-										//overwrite
-											$array[$this->table][$x][$this->uuid_prefix.'uuid'] = uuid();
-											$array[$this->table][$x]['call_flow_description'] = trim($row['call_flow_description'].' ('.$text['label-copy'].')');
+											//copy data
+												$array[$this->table][$x] = $row;
 
+											//overwrite
+												$array[$this->table][$x][$this->uuid_prefix.'uuid'] = $new_call_flow_uuid;
+												$array[$this->table][$x]['dialplan_uuid'] = $new_dialplan_uuid;
+												$array[$this->table][$x]['call_flow_description'] = trim($row['call_flow_description'].' ('.$text['label-copy'].')');
+
+											//call flow dialplan record
+												$sql_2 = "select * from v_dialplans where dialplan_uuid = :dialplan_uuid";
+												$parameters_2['dialplan_uuid'] = $row['dialplan_uuid'];
+												$database = new database;
+												$dialplan = $database->select($sql_2, $parameters_2, 'row');
+												if (is_array($dialplan) && @sizeof($dialplan) != 0) {
+
+													//copy data
+														$array['dialplans'][$x] = $dialplan;
+
+													//overwrite
+														$array['dialplans'][$x]['dialplan_uuid'] = $new_dialplan_uuid;
+														$dialplan_xml = $dialplan['dialplan_xml'];
+														$dialplan_xml = str_replace($row['call_flow_uuid'], $new_call_flow_uuid, $dialplan_xml); //replace source call_flow_uuid with new
+														$dialplan_xml = str_replace($dialplan['dialplan_uuid'], $new_dialplan_uuid, $dialplan_xml); //replace source dialplan_uuid with new
+														$array['dialplans'][$x]['dialplan_xml'] = $dialplan_xml;
+														$array['dialplans'][$x]['dialplan_description'] = trim($dialplan['dialplan_description'].' ('.$text['label-copy'].')');
+
+												}
+												unset($sql_2, $parameters_2, $dialplan);
+
+											//create call flow context array
+												$call_flow_contexts = $row['call_flow_context'];
+										}
 									}
-								}
-								unset($sql, $parameters, $rows, $row);
+									unset($sql, $parameters, $rows, $row);
 							}
 
 						//save the changes and set the message
 							if (is_array($array) && @sizeof($array) != 0) {
 
+								//grant temporary permissions
+									$p = new permissions;
+									$p->add('dialplan_add', 'temp');
+
 								//save the array
 									$database = new database;
 									$database->app_name = $this->app_name;
@@ -224,6 +334,24 @@ if (!class_exists('call_flows')) {
 									$database->save($array);
 									unset($array);
 
+								//revoke temporary permissions
+									$p->delete('dialplan_add', 'temp');
+
+								//syncrhonize configuration
+									save_dialplan_xml();
+
+								//apply settings reminder
+									$_SESSION["reload_xml"] = true;
+
+								//clear the cache
+									if (is_array($call_flow_contexts) && @sizeof($call_flow_contexts) != 0) {
+										$call_flow_contexts = array_unique($call_flow_contexts);
+										$cache = new cache;
+										foreach ($call_flow_contexts as $call_flow_context) {
+											$cache->delete("dialplan:".$call_flow_context);
+										}
+									}
+
 								//set message
 									message::add($text['message-copy']);
 
@@ -232,9 +360,9 @@ if (!class_exists('call_flows')) {
 					}
 
 			}
-		}
+		} //method
 
-	}
+	} //class
 }
 
 ?>
\ No newline at end of file