diff --git a/resources/templates/provision/mitel/5324/MN_{$mac}.cfg b/resources/templates/provision/mitel/5324/MN_{$mac}.cfg
index 23537bcda2..7fad2f88dd 100644
--- a/resources/templates/provision/mitel/5324/MN_{$mac}.cfg
+++ b/resources/templates/provision/mitel/5324/MN_{$mac}.cfg
@@ -3,17 +3,15 @@
 	{if isset($mitel_tftp_config)}<tftp_config>{$mitel_tftp_config}</tftp_config>{else}<tftp_config>2</tftp_config>
 	{/if}<pppoe_enable>0</pppoe_enable>
 	<tftp_task_enable>1</tftp_task_enable>
-	<boot_version>02.00.00.24</boot_version>
-	<image_version>R7.2.02.00.00.24</image_version>
-	<tftp_upgrade>0</tftp_upgrade>
+	<tftp_upgrade>2</tftp_upgrade>
 	<http_upgrade>0</http_upgrade>
 	<outbound_state>0</outbound_state>
 	<local_sip_port>5060</local_sip_port>
 	<tos>0</tos>
 	<e802_priority>-1</e802_priority>
 	{if isset($mitel_vlan_id)}<vlan_id>{$mitel_vlan_id}</vlan_id>{else}<vlan_id>-1</vlan_id>
-	{/if}<host_name>sip1</host_name>
-	<domain>-example.com</domain>
+	{/if}<host_name>{$account.1.user_id}</host_name>
+	<domain>{$domain_name}</domain>
 	<addr_type>0</addr_type>
 	<hot_line>0</hot_line>
 	<hot_address>operator@example.com</hot_address>
@@ -32,9 +30,9 @@
 	<checkpeercert>0</checkpeercert>
 	<sipkeepalive>1</sipkeepalive>
 	<rss_feed></rss_feed>
-	<host_ip>135.199.77.12</host_ip>
-	<video_ip>135.199.77.12</video_ip>
-	<sntp>128.138.141.172</sntp>
+	<host_ip>{$domain_name}</host_ip>
+	<video_ip>{$domain_name}</video_ip>
+	<sntp>0.us.pool.ntp.org</sntp>
 	<time_zone>{$mitel_time_zone}</time_zone>
 	<auth_method>2</auth_method>
 	<register_expire>120</register_expire>
@@ -64,7 +62,7 @@
 	<pbIndex>0</pbIndex>
 	<adminId>admin</adminId>
 	<admin_dispname>Administrator</admin_dispname>
-	<admin_passwd>510731ac096ebcb3989fb1ed5b7075bb</admin_passwd>
+	<admin_passwd>{$admin_password}</admin_passwd>
 	<busy_fwd_mode>0</busy_fwd_mode>
 	<busy_fwd_addr></busy_fwd_addr>
 	<always_fwd_mode>0</always_fwd_mode>
@@ -298,7 +296,7 @@
 	<firmware_abs_timer_min>59</firmware_abs_timer_min>
 	<firmware_abs_enable>1</firmware_abs_enable>
 	<installer_passcode></installer_passcode>
-	<user_passwd>5d41402abc4b2a76b9719d911017c592</user_passwd>
+	<user_passwd>{$user_password}</user_passwd>
 	<web_logo1></web_logo1>
 	<!--<web_logo1>&lt;img src="http://sipdnld.mitel.com/mitel.gif" alt="Mitel" width="143" height="43" hspace="0" align="left" /&gt;</web_logo1>-->
 	<sip_mode>sip</sip_mode>
diff --git a/resources/templates/provision/mitel/5330/MN_{$mac}.cfg b/resources/templates/provision/mitel/5330/MN_{$mac}.cfg
index ab4108f7b6..6dd482ae21 100644
--- a/resources/templates/provision/mitel/5330/MN_{$mac}.cfg
+++ b/resources/templates/provision/mitel/5330/MN_{$mac}.cfg
@@ -1,19 +1,17 @@
-<Parameter Model="5340">
+<Parameter Model="5330">
 	<dhcpenable>1</dhcpenable>
 	{if isset($mitel_tftp_config)}<tftp_config>{$mitel_tftp_config}</tftp_config>{else}<tftp_config>2</tftp_config>
 	{/if}<pppoe_enable>0</pppoe_enable>
 	<tftp_task_enable>1</tftp_task_enable>
-	<boot_version>02.00.00.24</boot_version>
-	<image_version>R7.2.02.00.00.24</image_version>
-	<tftp_upgrade>0</tftp_upgrade>
+	<tftp_upgrade>2</tftp_upgrade>
 	<http_upgrade>0</http_upgrade>
 	<outbound_state>0</outbound_state>
 	<local_sip_port>5060</local_sip_port>
 	<tos>0</tos>
 	<e802_priority>-1</e802_priority>
 	{if isset($mitel_vlan_id)}<vlan_id>{$mitel_vlan_id}</vlan_id>{else}<vlan_id>-1</vlan_id>
-	{/if}<host_name>sip1</host_name>
-	<domain>-example.com</domain>
+	{/if}<host_name>{$account.1.user_id}</host_name>
+	<domain>{$domain_name}</domain>
 	<addr_type>0</addr_type>
 	<hot_line>0</hot_line>
 	<hot_address>operator@example.com</hot_address>
@@ -32,9 +30,9 @@
 	<checkpeercert>0</checkpeercert>
 	<sipkeepalive>1</sipkeepalive>
 	<rss_feed></rss_feed>
-	<host_ip>135.199.77.12</host_ip>
-	<video_ip>135.199.77.12</video_ip>
-	<sntp>128.138.141.172</sntp>
+	<host_ip>{$domain_name}</host_ip>
+	<video_ip>{$domain_name}</video_ip>
+	<sntp>0.us.pool.ntp.org</sntp>
 	<time_zone>{$mitel_time_zone}</time_zone>
 	<auth_method>2</auth_method>
 	<register_expire>120</register_expire>
@@ -64,7 +62,7 @@
 	<pbIndex>0</pbIndex>
 	<adminId>admin</adminId>
 	<admin_dispname>Administrator</admin_dispname>
-	<admin_passwd>510731ac096ebcb3989fb1ed5b7075bb</admin_passwd>
+	<admin_passwd>{$admin_password}</admin_passwd>
 	<busy_fwd_mode>0</busy_fwd_mode>
 	<busy_fwd_addr></busy_fwd_addr>
 	<always_fwd_mode>0</always_fwd_mode>
@@ -298,7 +296,7 @@
 	<firmware_abs_timer_min>59</firmware_abs_timer_min>
 	<firmware_abs_enable>1</firmware_abs_enable>
 	<installer_passcode></installer_passcode>
-	<user_passwd>5d41402abc4b2a76b9719d911017c592</user_passwd>
+	<user_passwd>{$user_password}</user_passwd>
 	<web_logo1></web_logo1>
 	<!--<web_logo1>&lt;img src="http://sipdnld.mitel.com/mitel.gif" alt="Mitel" width="143" height="43" hspace="0" align="left" /&gt;</web_logo1>-->
 	<sip_mode>sip</sip_mode>
diff --git a/resources/templates/provision/mitel/5340/MN_{$mac}.cfg b/resources/templates/provision/mitel/5340/MN_{$mac}.cfg
index 23537bcda2..62a9bfc261 100644
--- a/resources/templates/provision/mitel/5340/MN_{$mac}.cfg
+++ b/resources/templates/provision/mitel/5340/MN_{$mac}.cfg
@@ -1,19 +1,17 @@
-<Parameter Model="5324">
+<Parameter Model="5340">
 	<dhcpenable>1</dhcpenable>
 	{if isset($mitel_tftp_config)}<tftp_config>{$mitel_tftp_config}</tftp_config>{else}<tftp_config>2</tftp_config>
 	{/if}<pppoe_enable>0</pppoe_enable>
 	<tftp_task_enable>1</tftp_task_enable>
-	<boot_version>02.00.00.24</boot_version>
-	<image_version>R7.2.02.00.00.24</image_version>
-	<tftp_upgrade>0</tftp_upgrade>
+	<tftp_upgrade>2</tftp_upgrade>
 	<http_upgrade>0</http_upgrade>
 	<outbound_state>0</outbound_state>
 	<local_sip_port>5060</local_sip_port>
 	<tos>0</tos>
 	<e802_priority>-1</e802_priority>
 	{if isset($mitel_vlan_id)}<vlan_id>{$mitel_vlan_id}</vlan_id>{else}<vlan_id>-1</vlan_id>
-	{/if}<host_name>sip1</host_name>
-	<domain>-example.com</domain>
+	{/if}<host_name>{$account.1.user_id}</host_name>
+	<domain>{$domain_name}</domain>
 	<addr_type>0</addr_type>
 	<hot_line>0</hot_line>
 	<hot_address>operator@example.com</hot_address>
@@ -32,9 +30,9 @@
 	<checkpeercert>0</checkpeercert>
 	<sipkeepalive>1</sipkeepalive>
 	<rss_feed></rss_feed>
-	<host_ip>135.199.77.12</host_ip>
-	<video_ip>135.199.77.12</video_ip>
-	<sntp>128.138.141.172</sntp>
+	<host_ip>{$domain_name}</host_ip>
+	<video_ip>{$domain_name}</video_ip>
+	<sntp>0.us.pool.ntp.org</sntp>
 	<time_zone>{$mitel_time_zone}</time_zone>
 	<auth_method>2</auth_method>
 	<register_expire>120</register_expire>
@@ -64,7 +62,7 @@
 	<pbIndex>0</pbIndex>
 	<adminId>admin</adminId>
 	<admin_dispname>Administrator</admin_dispname>
-	<admin_passwd>510731ac096ebcb3989fb1ed5b7075bb</admin_passwd>
+	<admin_passwd>{$admin_password}</admin_passwd>
 	<busy_fwd_mode>0</busy_fwd_mode>
 	<busy_fwd_addr></busy_fwd_addr>
 	<always_fwd_mode>0</always_fwd_mode>
@@ -298,7 +296,7 @@
 	<firmware_abs_timer_min>59</firmware_abs_timer_min>
 	<firmware_abs_enable>1</firmware_abs_enable>
 	<installer_passcode></installer_passcode>
-	<user_passwd>5d41402abc4b2a76b9719d911017c592</user_passwd>
+	<user_passwd>{$user_password}</user_passwd>
 	<web_logo1></web_logo1>
 	<!--<web_logo1>&lt;img src="http://sipdnld.mitel.com/mitel.gif" alt="Mitel" width="143" height="43" hspace="0" align="left" /&gt;</web_logo1>-->
 	<sip_mode>sip</sip_mode>