diff --git a/app/ivr_menu/ivr_menu_delete.php b/app/ivr_menu/ivr_menu_delete.php
index f132f56eb3..57aba273fe 100644
--- a/app/ivr_menu/ivr_menu_delete.php
+++ b/app/ivr_menu/ivr_menu_delete.php
@@ -42,7 +42,7 @@ if (strlen($id)>0) {
 
 	//include the ivr menu class
 		require_once "includes/classes/database.php";
-		require_once "includes/classes/switch_ivr_menu.php";
+		require_once "/app/ivr_menu/resources/classes/switch_ivr_menu.php";
 		$ivr = new switch_ivr_menu;
 		$ivr->domain_uuid = $_SESSION["domain_uuid"];
 		$ivr->ivr_menu_uuid = $id;
diff --git a/app/ivr_menu/ivr_menu_edit.php b/app/ivr_menu/ivr_menu_edit.php
index 7ec0fcaf80..7f6486919c 100644
--- a/app/ivr_menu/ivr_menu_edit.php
+++ b/app/ivr_menu/ivr_menu_edit.php
@@ -173,7 +173,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		if ($_POST["persistformvar"] != "true") {
 			//prepare the object
 				require_once "includes/classes/database.php";
-				require_once "includes/classes/switch_ivr_menu.php";
+				require_once "/app/ivr_menu/resources/classes/switch_ivr_menu.php";
 				$ivr = new switch_ivr_menu;
 				$ivr->domain_uuid = $_SESSION["domain_uuid"];
 				$ivr->ivr_menu_name = $ivr_menu_name;
@@ -246,7 +246,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 //pre-populate the form
 	if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
 		$ivr_menu_uuid = $_GET["id"];
-		require_once "includes/classes/switch_ivr_menu.php";
+		require_once "/app/ivr_menu/resources/classes/switch_ivr_menu.php";
 		$ivr = new switch_ivr_menu;
 		$ivr->domain_uuid = $_SESSION["domain_uuid"];
 		$ivr->ivr_menu_uuid = $ivr_menu_uuid;
diff --git a/app/ivr_menu/ivr_menu_option_delete.php b/app/ivr_menu/ivr_menu_option_delete.php
index 7b9f54a73f..681e7e3a95 100644
--- a/app/ivr_menu/ivr_menu_option_delete.php
+++ b/app/ivr_menu/ivr_menu_option_delete.php
@@ -44,7 +44,7 @@ else {
 	if (strlen($id)>0) {
 		//include the ivr menu class
 			require_once "includes/classes/database.php";
-			require_once "includes/classes/switch_ivr_menu.php";
+			require_once "/app/ivr_menu/resources/classes/switch_ivr_menu.php";
 			$ivr = new switch_ivr_menu;
 			$ivr->domain_uuid = $_SESSION["domain_uuid"];
 			$ivr->ivr_menu_option_uuid = $id;
diff --git a/app/ivr_menu/ivr_menu_option_edit.php b/app/ivr_menu/ivr_menu_option_edit.php
index 54e29337ea..0970f21a4e 100644
--- a/app/ivr_menu/ivr_menu_option_edit.php
+++ b/app/ivr_menu/ivr_menu_option_edit.php
@@ -101,7 +101,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		if ($_POST["persistformvar"] != "true") {
 			//create the object
 				require_once "includes/classes/database.php";
-				require_once "includes/classes/switch_ivr_menu.php";
+				require_once "/app/ivr_menu/resources/classes/switch_ivr_menu.php";
 				$ivr = new switch_ivr_menu;
 				$ivr->domain_uuid = $_SESSION["domain_uuid"];
 				$ivr->ivr_menu_uuid = $ivr_menu_uuid;
diff --git a/app/ivr_menu/ivr_menus.php b/app/ivr_menu/ivr_menus.php
index 0e64c16e91..8458b040bc 100644
--- a/app/ivr_menu/ivr_menus.php
+++ b/app/ivr_menu/ivr_menus.php
@@ -70,7 +70,7 @@ require_once "includes/paging.php";
 
 	//get the count
 		require_once "includes/classes/database.php";
-		require_once "includes/classes/switch_ivr_menu.php";
+		require_once "/app/ivr_menu/resources/classes/switch_ivr_menu.php";
 		$ivr = new switch_ivr_menu;
 		$ivr->domain_uuid = $_SESSION["domain_uuid"];
 		$ivr->table = "v_ivr_menus";
diff --git a/app/ivr_menu/resources/classes/switch_ivr_menu.php b/app/ivr_menu/resources/classes/switch_ivr_menu.php
index 7b49d7c2b6..be0df43542 100644
--- a/app/ivr_menu/resources/classes/switch_ivr_menu.php
+++ b/app/ivr_menu/resources/classes/switch_ivr_menu.php
@@ -259,16 +259,21 @@ require_once "includes/classes/switch_dialplan.php";
 							$database->fields['dialplan_uuid'] = $this->dialplan_uuid;
 							$database->fields['dialplan_detail_uuid'] = uuid();
 							$database->fields['dialplan_detail_tag'] = 'action'; //condition, action, antiaction
-							$database->fields['dialplan_detail_type'] = 'ivr';
-							if (count($_SESSION["domains"]) > 1) {
-								$database->fields['dialplan_detail_data'] = $_SESSION['domain_name'].'-'.$this->ivr_menu_name;
-							}
-							else {
-								$database->fields['dialplan_detail_data'] = $this->ivr_menu_name;
-							}
+							$database->fields['dialplan_detail_type'] = 'set';
+							$database->fields['dialplan_detail_data'] = 'ivr_menu_uuid='.$this->ivr_menu_uuid;
 							$database->fields['dialplan_detail_order'] = '035';
 							$database->add();
 
+							$database->table = "v_dialplan_details";
+							$database->fields['domain_uuid'] = $this->domain_uuid;
+							$database->fields['dialplan_uuid'] = $this->dialplan_uuid;
+							$database->fields['dialplan_detail_uuid'] = uuid();
+							$database->fields['dialplan_detail_tag'] = 'action'; //condition, action, antiaction
+							$database->fields['dialplan_detail_type'] = 'lua';
+							$database->fields['dialplan_detail_data'] = 'ivr_menu.lua';
+							$database->fields['dialplan_detail_order'] = '040';
+							$database->add();
+
 							if (strlen($this->ivr_menu_exit_app) > 0) {
 								$database->table = "v_dialplan_details";
 								$database->fields['domain_uuid'] = $this->domain_uuid;
@@ -277,7 +282,7 @@ require_once "includes/classes/switch_dialplan.php";
 								$database->fields['dialplan_detail_tag'] = 'action'; //condition, action, antiaction
 								$database->fields['dialplan_detail_type'] = $this->ivr_menu_exit_app;
 								$database->fields['dialplan_detail_data'] = $this->ivr_menu_exit_data;
-								$database->fields['dialplan_detail_order'] = '040';
+								$database->fields['dialplan_detail_order'] = '045';
 								$database->add();
 							}
 						}