diff --git a/includes/install/scripts/app.lua b/includes/install/scripts/app.lua
index 7f4bc71c5b..bef17a7591 100644
--- a/includes/install/scripts/app.lua
+++ b/includes/install/scripts/app.lua
@@ -25,7 +25,8 @@
 
 --include config.lua
 	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --get the argv values
 	script_name = argv[0];
diff --git a/includes/install/scripts/app/voicemail/resources/scripts/mwi.lua b/includes/install/scripts/app/voicemail/resources/scripts/mwi.lua
index 46abd1ba33..78068110bf 100644
--- a/includes/install/scripts/app/voicemail/resources/scripts/mwi.lua
+++ b/includes/install/scripts/app/voicemail/resources/scripts/mwi.lua
@@ -25,7 +25,8 @@
 
 --include the lua script
 	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir .. "/resources/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --define general settings
 	tmp_file = "/usr/local/freeswitch/log/mwi.tmp";
diff --git a/includes/install/scripts/app/xml_handler/index.lua b/includes/install/scripts/app/xml_handler/index.lua
index c82a574a2f..d452086430 100644
--- a/includes/install/scripts/app/xml_handler/index.lua
+++ b/includes/install/scripts/app/xml_handler/index.lua
@@ -30,9 +30,9 @@
 	expire["sofia.conf"] = "3600";
 
 --set the debug options
-	debug["params"] = true;
+	debug["params"] = false;
 	debug["sql"] = false;
-	debug["xml_request"] = true;
+	debug["xml_request"] = false;
 	debug["xml_string"] = false;
 	debug["cache"] = false;
 
diff --git a/includes/install/scripts/call_flow.lua b/includes/install/scripts/call_flow.lua
index 3f1985fa0d..35c6243117 100644
--- a/includes/install/scripts/call_flow.lua
+++ b/includes/install/scripts/call_flow.lua
@@ -30,7 +30,8 @@
 
 --include config.lua
 	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");
diff --git a/includes/install/scripts/call_flow_monitor.lua b/includes/install/scripts/call_flow_monitor.lua
index a7a0673d12..c6cff6aa04 100644
--- a/includes/install/scripts/call_flow_monitor.lua
+++ b/includes/install/scripts/call_flow_monitor.lua
@@ -33,7 +33,8 @@
 
 --include config.lua
 	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --general functions
 	dofile(scripts_dir.."/resources/functions/file_exists.lua");
diff --git a/includes/install/scripts/destination_caller_id.lua b/includes/install/scripts/destination_caller_id.lua
index 9296277b62..89742740ad 100644
--- a/includes/install/scripts/destination_caller_id.lua
+++ b/includes/install/scripts/destination_caller_id.lua
@@ -26,7 +26,8 @@
 
 --include config.lua
 	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");
diff --git a/includes/install/scripts/dial_string.lua b/includes/install/scripts/dial_string.lua
index a311c390b7..606296eff6 100644
--- a/includes/install/scripts/dial_string.lua
+++ b/includes/install/scripts/dial_string.lua
@@ -34,7 +34,8 @@
 
 --include config.lua
 	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");
diff --git a/includes/install/scripts/directory.lua b/includes/install/scripts/directory.lua
index 1be8a5673b..907ecbd363 100644
--- a/includes/install/scripts/directory.lua
+++ b/includes/install/scripts/directory.lua
@@ -39,7 +39,8 @@
 
 --include config.lua
 	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");
diff --git a/includes/install/scripts/eavesdrop.lua b/includes/install/scripts/eavesdrop.lua
index 308cc576b0..4132794016 100644
--- a/includes/install/scripts/eavesdrop.lua
+++ b/includes/install/scripts/eavesdrop.lua
@@ -29,7 +29,8 @@ extension = argv[1];
 
 --include config.lua
 	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --add the file_exists function
 	dofile(scripts_dir.."/resources/functions/file_exists.lua");
diff --git a/includes/install/scripts/intercept.lua b/includes/install/scripts/intercept.lua
index 1bdf8ae675..f61ad3dce3 100644
--- a/includes/install/scripts/intercept.lua
+++ b/includes/install/scripts/intercept.lua
@@ -32,7 +32,8 @@
 
 --include config.lua
 	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	if (file_exists(database_dir.."/core.db") then
diff --git a/includes/install/scripts/ivr_menu.lua b/includes/install/scripts/ivr_menu.lua
index 3b9be116aa..ef6b80af5d 100644
--- a/includes/install/scripts/ivr_menu.lua
+++ b/includes/install/scripts/ivr_menu.lua
@@ -33,7 +33,8 @@
 
 --include config.lua
 	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");
diff --git a/includes/install/scripts/park.lua b/includes/install/scripts/park.lua
index 04500dd0d1..b6a1c08310 100644
--- a/includes/install/scripts/park.lua
+++ b/includes/install/scripts/park.lua
@@ -16,7 +16,8 @@
 
 --include config.lua
 	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	--dbh = freeswitch.Dbh("core:core"); -- when using sqlite
diff --git a/includes/install/scripts/park_monitor.lua b/includes/install/scripts/park_monitor.lua
index b611404802..e7b0a7a455 100644
--- a/includes/install/scripts/park_monitor.lua
+++ b/includes/install/scripts/park_monitor.lua
@@ -30,7 +30,8 @@
 
 --include config.lua
 	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	--dbh = freeswitch.Dbh("core:core"); -- when using sqlite
diff --git a/includes/install/scripts/ring_group.lua b/includes/install/scripts/ring_group.lua
index e78908d02b..5b92b8f779 100644
--- a/includes/install/scripts/ring_group.lua
+++ b/includes/install/scripts/ring_group.lua
@@ -26,7 +26,8 @@
 
 --include config.lua
 	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
-	dofile(scripts_dir.."/resources/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");