diff --git a/app/ivr_menus/ivr_menu_edit.php b/app/ivr_menus/ivr_menu_edit.php
index 40a40e3d24..2c4dcec7f5 100644
--- a/app/ivr_menus/ivr_menu_edit.php
+++ b/app/ivr_menus/ivr_menu_edit.php
@@ -462,12 +462,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		if (count($result) > 0) {
 			echo "<optgroup label='Phrases'>\n";
 			foreach ($result as &$row) {
-				if ($ivr_menu_greet_long == "phrase:".$row["phrase_name"].".".$domain_uuid) {
+				if ($ivr_menu_greet_long == "phrase:".$row["phrase_uuid"]) {
 					$tmp_selected = true;
-					echo "	<option value='phrase:".$row["phrase_name"].".".$domain_uuid."' selected='selected'>".$row["phrase_name"]."</option>\n";
+					echo "	<option value='phrase:".$row["phrase_uuid"]."' selected='selected'>".$row["phrase_name"]."</option>\n";
 				}
 				else {
-					echo "	<option value='phrase:".$row["phrase_name"].".".$domain_uuid."'>".$row["phrase_name"]."</option>\n";
+					echo "	<option value='phrase:".$row["phrase_uuid"]."'>".$row["phrase_name"]."</option>\n";
 				}
 			}
 			unset ($prep_statement);
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/languages/languages.lua b/resources/install/scripts/app/xml_handler/resources/scripts/languages/languages.lua
index 982444e962..7cf04fc700 100644
--- a/resources/install/scripts/app/xml_handler/resources/scripts/languages/languages.lua
+++ b/resources/install/scripts/app/xml_handler/resources/scripts/languages/languages.lua
@@ -127,7 +127,7 @@
 									table.insert(xml, [[						</input>]]);
 									table.insert(xml, [[					</macro>]]);;
 								end
-								table.insert(xml, [[					<macro name="]]..row.phrase_name..[[.]]..row.domain_uuid..[[">]]);
+								table.insert(xml, [[					<macro name="]]..row.phrase_uuid..[[">]]);
 								table.insert(xml, [[						<input pattern=\"(.*)\">]]);
 								table.insert(xml, [[							<match>]]);
 								match_open_tag = true