diff --git a/resources/templates/provision/snom/720/{$mac}.xml b/resources/templates/provision/snom/720/{$mac}.xml
index 42a00aca1b..466bdb66dd 100644
--- a/resources/templates/provision/snom/720/{$mac}.xml
+++ b/resources/templates/provision/snom/720/{$mac}.xml
@@ -877,8 +877,8 @@
 <user_custom idx="10" perm=""></user_custom>
 <user_custom idx="11" perm=""></user_custom>
 <user_custom idx="12" perm=""></user_custom>
-<user_outbound idx="1" perm="">{$server_address_1}</user_outbound>
-<user_outbound idx="2" perm="">{$server_address_2}</user_outbound>
+<user_outbound idx="1">{$outbound_proxy_1}</user_outbound>
+<user_outbound idx="2" perm="">{$outbound_proxy_2}</user_outbound>
 <user_outbound idx="3" perm=""></user_outbound>
 <user_outbound idx="4" perm=""></user_outbound>
 <user_outbound idx="5" perm=""></user_outbound>
diff --git a/resources/templates/provision/snom/820/{$mac}.xml b/resources/templates/provision/snom/820/{$mac}.xml
index 86d65086ff..3cfdb2175c 100644
--- a/resources/templates/provision/snom/820/{$mac}.xml
+++ b/resources/templates/provision/snom/820/{$mac}.xml
@@ -10,12 +10,19 @@
 <message_led_other>off</message_led_other>
 <user_phone>off</user_phone>
 <intercom_enabled>on</intercom_enabled>
-<http_user>admin</http_user>
-<http_pass>admin</http_pass>
+{if isset($admin_password) }
+<http_user perm="">{$admin_name}</http_user>
+<http_pass perm="">{$admin_password}</http_pass>
+{/if}
 <web_logout_timer>5</web_logout_timer>
+{if isset($admin_password) }
+<admin_mode_login perm="">{$admin_name}</admin_mode_login>
+<admin_mode_password perm="">{$admin_password}</admin_mode_password>
+<admin_mode_password_confirm perm="">{$admin_password}</admin_mode_password_confirm>
+{else}
 <admin_mode_password>0000</admin_mode_password>
 <admin_mode_password_confirm>0000</admin_mode_password_confirm>
-<admin_mode>on</admin_mode>
+{/if}
 <language>English</language>
 <ntp_server>{$server_address_1}</ntp_server>
 <timezone>AUS+10</timezone>
@@ -27,7 +34,8 @@
 <user_realname idx="1">{$display_name_1}</user_realname>
 <user_name idx="1">{$user_id_1}</user_name>
 <user_host idx="1">{$server_address_1}</user_host>
-<user_pname idx="1">{$user_password_1}</user_pname>
+<user_outbound idx="1">{$outbound_proxy_1}</user_outbound>
+<user_password idx="1">{$user_password_1}</user_password>
 <user_ringer idx="1">Ringer9</user_ringer>
 <user_mailbox idx="1">4000</user_mailbox>
 <user_srtp idx="1" perm="">off</user_srtp>