diff --git a/core/databases/app_defaults.php b/core/databases/app_defaults.php
index dbd68274fe..ea4d04d6c9 100644
--- a/core/databases/app_defaults.php
+++ b/core/databases/app_defaults.php
@@ -131,6 +131,9 @@ if ($domains_processed == 1) {
 			if (strlen($_SESSION['switch']['sounds']['dir']) > 0) {
 				$tmp .= correct_path("	sounds_dir = [[".$_SESSION['switch']['sounds']['dir']."]];\n");
 			}
+			if (strlen($_SESSION['switch']['phrases']['dir']) > 0) {
+				$tmp .= correct_path("	phrases_dir = [[".$_SESSION['switch']['phrases']['dir']."]];\n");
+			}
 			if (strlen($_SESSION['switch']['db']['dir']) > 0) {
 				$tmp .= correct_path("	database_dir = [[".$_SESSION['switch']['db']['dir']."]];\n");
 			}
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 c607d699b3..6254bff9de 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
@@ -142,18 +142,9 @@
 							table.insert(xml, [[					</macro>]]);;
 						end
 						
-						require "resources.functions.settings";
-						settings = settings(domain_uuid);
-						lang_path = "/usr/local/freeswitch/conf/lang/";
-						if (settings['switch']['phrases'] ~= nil) then
-							if (settings['switch']['phrases']['dir'] ~= nil) then
-								lang_path = settings['switch']['phrases']['dir'];
-							end
-						end
-
 						--read root xml language file, parse included xml files
 							local xml_file_paths = {}
-							local file_handle = io.open(lang_path.."/"..language.."/"..language..".xml", "r");
+							local file_handle = io.open(phrases_dir.."/"..language.."/"..language..".xml", "r");
 							if (file_handle ~= nil) then
 								for file_line in file_handle:lines() do
 									if (string.find(file_line, 'cmd="include" data="', 0, true) ~= nil) then