diff --git a/resources/install.php b/resources/install.php
index e1f17ec155..63ca60110f 100644
--- a/resources/install.php
+++ b/resources/install.php
@@ -883,7 +883,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
 		$tmp[$x]['subcategory'] = 'time_zone';
 		$tmp[$x]['enabled'] = 'true';
 		$x++;
-                $tmp[$x]['name'] = 'code';
+        $tmp[$x]['name'] = 'code';
 		$tmp[$x]['value'] = 'en-us';
 		$tmp[$x]['category'] = 'domain';
 		$tmp[$x]['subcategory'] = 'language';
@@ -953,19 +953,19 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
 		$tmp[$x]['value'] = $switch_extensions_dir;
 		$tmp[$x]['category'] = 'switch';
 		$tmp[$x]['subcategory'] = 'extensions';
-		$tmp[$x]['enabled'] = 'true';
+		$tmp[$x]['enabled'] = 'false';
 		$x++;
 		$tmp[$x]['name'] = 'dir';
 		$tmp[$x]['value'] = $switch_sip_profiles_dir;
 		$tmp[$x]['category'] = 'switch';
 		$tmp[$x]['subcategory'] = 'sip_profiles';
-		$tmp[$x]['enabled'] = 'true';
+		$tmp[$x]['enabled'] = 'false';
 		$x++;
 		$tmp[$x]['name'] = 'dir';
 		$tmp[$x]['value'] = $switch_dialplan_dir;
 		$tmp[$x]['category'] = 'switch';
 		$tmp[$x]['subcategory'] = 'dialplan';
-		$tmp[$x]['enabled'] = 'true';
+		$tmp[$x]['enabled'] = 'false';
 		$x++;
 		$tmp[$x]['name'] = 'dir';
 		$tmp[$x]['value'] = $switch_mod_dir;
diff --git a/resources/templates/conf/autoload_configs/callcenter.conf.xml b/resources/templates/conf/autoload_configs/callcenter.conf.xml.noload
similarity index 100%
rename from resources/templates/conf/autoload_configs/callcenter.conf.xml
rename to resources/templates/conf/autoload_configs/callcenter.conf.xml.noload
diff --git a/resources/templates/conf/autoload_configs/conference.conf.xml b/resources/templates/conf/autoload_configs/conference.conf.xml.noload
similarity index 100%
rename from resources/templates/conf/autoload_configs/conference.conf.xml
rename to resources/templates/conf/autoload_configs/conference.conf.xml.noload
diff --git a/resources/templates/conf/autoload_configs/lua.conf.xml b/resources/templates/conf/autoload_configs/lua.conf.xml
index 1eb594f0b5..a608494467 100644
--- a/resources/templates/conf/autoload_configs/lua.conf.xml
+++ b/resources/templates/conf/autoload_configs/lua.conf.xml
@@ -15,8 +15,8 @@
     <!-- <param name="script-directory" value="/usr/local/lua/?.lua"/> -->
     <!-- <param name="script-directory" value="$${base_dir}/scripts/?.lua"/> -->
 
-    <!--<param name="xml-handler-script" value="/dp.lua"/>-->
-    <!--<param name="xml-handler-bindings" value="dialplan"/>-->
+    <param name="xml-handler-script" value="app.lua xml_handler"/>
+    <param name="xml-handler-bindings" value="configuration,dialplan,directory"/>
 
     <!--
 	The following options identifies a lua script that is launched
diff --git a/resources/templates/conf/dialplan/default.xml b/resources/templates/conf/dialplan/default.xml.noload
similarity index 100%
rename from resources/templates/conf/dialplan/default.xml
rename to resources/templates/conf/dialplan/default.xml.noload
diff --git a/resources/templates/conf/dialplan/empty.xml b/resources/templates/conf/dialplan/empty.xml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/resources/templates/conf/dialplan/features.xml b/resources/templates/conf/dialplan/features.xml.noload
similarity index 100%
rename from resources/templates/conf/dialplan/features.xml
rename to resources/templates/conf/dialplan/features.xml.noload
diff --git a/resources/templates/conf/dialplan/public.xml b/resources/templates/conf/dialplan/public.xml.noload
similarity index 100%
rename from resources/templates/conf/dialplan/public.xml
rename to resources/templates/conf/dialplan/public.xml.noload
diff --git a/resources/templates/conf/dialplan/skinny-patterns.xml b/resources/templates/conf/dialplan/skinny-patterns.xml.noload
similarity index 100%
rename from resources/templates/conf/dialplan/skinny-patterns.xml
rename to resources/templates/conf/dialplan/skinny-patterns.xml.noload
diff --git a/resources/templates/conf/directory/default.xml b/resources/templates/conf/directory/default.xml.noload
similarity index 100%
rename from resources/templates/conf/directory/default.xml
rename to resources/templates/conf/directory/default.xml.noload
diff --git a/resources/templates/conf/directory/empty.xml b/resources/templates/conf/directory/empty.xml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/resources/templates/conf/sip_profiles/empty.xml b/resources/templates/conf/sip_profiles/empty.xml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/resources/templates/conf/sip_profiles/external.xml b/resources/templates/conf/sip_profiles/external.xml.noload
similarity index 100%
rename from resources/templates/conf/sip_profiles/external.xml
rename to resources/templates/conf/sip_profiles/external.xml.noload
diff --git a/resources/templates/conf/sip_profiles/internal-ipv6.xml b/resources/templates/conf/sip_profiles/internal-ipv6.xml.noload
similarity index 100%
rename from resources/templates/conf/sip_profiles/internal-ipv6.xml
rename to resources/templates/conf/sip_profiles/internal-ipv6.xml.noload
diff --git a/resources/templates/conf/sip_profiles/internal.xml b/resources/templates/conf/sip_profiles/internal.xml.noload
similarity index 100%
rename from resources/templates/conf/sip_profiles/internal.xml
rename to resources/templates/conf/sip_profiles/internal.xml.noload