diff --git a/resources/templates/provision/snom/300/{$mac}.xml b/resources/templates/provision/snom/300/{$mac}.xml
index 962044cb82..76248f06be 100644
--- a/resources/templates/provision/snom/300/{$mac}.xml
+++ b/resources/templates/provision/snom/300/{$mac}.xml
@@ -15,11 +15,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></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>
+{/if}
 <admin_mode>on</admin_mode>
 <language perm="">English</language>
 <utc_offset perm=""></utc_offset>
diff --git a/resources/templates/provision/snom/320/{$mac}.xml b/resources/templates/provision/snom/320/{$mac}.xml
index 437fd0af71..504a40166e 100644
--- a/resources/templates/provision/snom/320/{$mac}.xml
+++ b/resources/templates/provision/snom/320/{$mac}.xml
@@ -18,11 +18,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></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>
+{/if}
 <admin_mode>on</admin_mode>
 <language>English</language>
 <utc_offset perm=""></utc_offset>
diff --git a/resources/templates/provision/snom/720/{$mac}.xml b/resources/templates/provision/snom/720/{$mac}.xml
index d9439dcd45..80dd3d2e39 100644
--- a/resources/templates/provision/snom/720/{$mac}.xml
+++ b/resources/templates/provision/snom/720/{$mac}.xml
@@ -58,11 +58,19 @@
 <auto_dial perm="">off</auto_dial>
 <privacy_in perm="">off</privacy_in>
 <privacy_out perm="">off</privacy_out>
+{if isset($admin_password) }
 <http_user perm="">{$admin_name}</http_user>
-<http_pass perm="">{$admin_password}</http_pass> 
+<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>
+{/if}
 <admin_mode perm="">on</admin_mode>
 <tone_scheme perm="">GBR</tone_scheme>
 <vol_headset perm="">7</vol_headset>