diff --git a/core/databases/app_defaults.php b/core/databases/app_defaults.php
index dfd247334e..4b990ff48d 100644
--- a/core/databases/app_defaults.php
+++ b/core/databases/app_defaults.php
@@ -182,7 +182,22 @@ if ($domains_processed == 1) {
 				}
 				$tmp .= "\n";
 			}
-
+			$tmp .= "--set defaults\n";
+			$tmp .= "	expire = {}\n";
+			$tmp .= "	expire[\"directory\"] = \"3600\";\n";
+			$tmp .= "	expire[\"dialplan\"] = \"3600\";\n";
+			$tmp .= "	expire[\"languages\"] = \"3600\";\n";
+			$tmp .= "	expire[\"sofia.conf\"] = \"3600\";\n";
+			$tmp .= "	expire[\"acl.conf\"] = \"3600\";\n";
+			$tmp .= "	load_balancing = false;\n";
+			$tmp .= "\n";
+			$tmp .= "--set the debug options\n";
+			$tmp .= "	debug[\"params\"] = false;\n";
+			$tmp .= "	debug[\"sql\"] = false;\n";
+			$tmp .= "	debug[\"xml_request\"] = false;\n";
+			$tmp .= "	debug[\"xml_string\"] = false;\n";
+			$tmp .= "	debug[\"cache\"] = false;\n";
+			$tmp .= "\n";
 			$tmp .= "--additional info\n";
 			$tmp .= "	domain_count = ".count($_SESSION["domains"]).";\n";
 			$tmp .= correct_path("	temp_dir = [[".$_SESSION['server']['temp']['dir']."]];\n");
diff --git a/resources/install/scripts/app/xml_handler/index.lua b/resources/install/scripts/app/xml_handler/index.lua
index d3aabc7f0c..5bc9b52be7 100644
--- a/resources/install/scripts/app/xml_handler/index.lua
+++ b/resources/install/scripts/app/xml_handler/index.lua
@@ -23,22 +23,6 @@
 --	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 --	POSSIBILITY OF SUCH DAMAGE.
 
---set defaults
-	expire = {}
-	expire["directory"] = "3600";
-	expire["dialplan"] = "3600";
-	expire["languages"] = "3600";
-	expire["sofia.conf"] = "3600";
-	expire["acl.conf"] = "3600";
-	load_balancing = false;
-
---set the debug options
-	debug["params"] = false;
-	debug["sql"] = false;
-	debug["xml_request"] = false;
-	debug["xml_string"] = false;
-	debug["cache"] = false;
-
 --general functions
 	require "resources.functions.trim";
 	require "resources.functions.file_exists";