diff --git a/resources/templates/provision/cisco/spa122/{$mac}.xml b/resources/templates/provision/cisco/spa122/{$mac}.xml
index 944eb018f6..b7ea35949d 100644
--- a/resources/templates/provision/cisco/spa122/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa122/{$mac}.xml
@@ -801,10 +801,10 @@
 <MAIL>0</MAIL>
 </System>
 </Log_Configuration>
-<Web_Login_Admin_Name>admin</Web_Login_Admin_Name>
-<!-- <Web_Login_Admin_Password></Web_Login_Admin_Password> -->
-<Web_Login_Guest_Name>cisco</Web_Login_Guest_Name>
-<!-- <Web_Login_Guest_Password></Web_Login_Guest_Password> -->
+<Web_Login_Admin_Name>{$admin_name}</Web_Login_Admin_Name>
+<Web_Login_Admin_Password>{$admin_password}</Web_Login_Admin_Password>
+<Web_Login_Guest_Name>{$user_name}</Web_Login_Guest_Name>
+<Web_Login_Guest_Password>{$user_password}</Web_Login_Guest_Password>
 <Firmware_Version>1.2.1</Firmware_Version>
 <Firmware_Build_Version>004</Firmware_Build_Version>
 <System_Model_Number>SPA122</System_Model_Number>
diff --git a/resources/templates/provision/cisco/spa301/{$mac}.xml b/resources/templates/provision/cisco/spa301/{$mac}.xml
index 42968f2974..2ed867be9b 100644
--- a/resources/templates/provision/cisco/spa301/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa301/{$mac}.xml
@@ -6,8 +6,8 @@
 <Enable_Web_Server group="System/System_Configuration">Yes</Enable_Web_Server>
 <Web_Server_Port group="System/System_Configuration">80</Web_Server_Port>
 <Enable_Web_Admin_Access group="System/System_Configuration">Yes</Enable_Web_Admin_Access>
-<Admin_Passwd group="System/System_Configuration" />
-<User_Password group="System/System_Configuration" />
+<Admin_Passwd group="System/System_Configuration">{$admin_password}</Admin_Passwd>
+<User_Password group="System/System_Configuration">{$user_password}</User_Password>
 <Signaling_Protocol group="System/System_Configuration">SIP</Signaling_Protocol>
 <SPCP_Auto-detect group="System/System_Configuration">Yes</SPCP_Auto-detect>
 <Phone-UI-readonly group="System/System_Configuration">No</Phone-UI-readonly>
diff --git a/resources/templates/provision/cisco/spa303/{$mac}.xml b/resources/templates/provision/cisco/spa303/{$mac}.xml
index 76b7298b38..8b901b90c3 100644
--- a/resources/templates/provision/cisco/spa303/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa303/{$mac}.xml
@@ -6,8 +6,8 @@
 <Enable_Web_Server ua="na">Yes</Enable_Web_Server>
 <Web_Server_Port ua="na">80</Web_Server_Port>
 <Enable_Web_Admin_Access ua="na">Yes</Enable_Web_Admin_Access>
-<Admin_Passwd ua="na"></Admin_Passwd>
-<User_Password ua="rw"></User_Password>
+<Admin_Passwd ua="na">{$admin_password}</Admin_Passwd>
+<User_Password ua="rw">{$user_password}</User_Password>
 <Signaling_Protocol ua="na">SIP</Signaling_Protocol> <!-- options: SIP/SPCP -->
 <SPCP_Auto-detect ua="na">Yes</SPCP_Auto-detect>
 <Phone-UI-readonly ua="na">No</Phone-UI-readonly>
diff --git a/resources/templates/provision/cisco/spa501g/{$mac}.xml b/resources/templates/provision/cisco/spa501g/{$mac}.xml
index b1833dfa4d..1dd2d5e67f 100644
--- a/resources/templates/provision/cisco/spa501g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa501g/{$mac}.xml
@@ -6,8 +6,8 @@
 <Enable_Web_Server group="System/System_Configuration">Yes</Enable_Web_Server>
 <Web_Server_Port group="System/System_Configuration">80</Web_Server_Port>
 <Enable_Web_Admin_Access group="System/System_Configuration">Yes</Enable_Web_Admin_Access>
-<Admin_Passwd group="System/System_Configuration" />
-<User_Password group="System/System_Configuration" />
+<Admin_Passwd group="System/System_Configuration">{$admin_password}</Admin_Passwd>
+<User_Password group="System/System_Configuration">{$user_password}</User_Password>
 <Signaling_Protocol group="System/System_Configuration">SIP</Signaling_Protocol>
 <SPCP_Auto-detect group="System/System_Configuration">Yes</SPCP_Auto-detect>
 <Phone-UI-readonly group="System/System_Configuration">No</Phone-UI-readonly>
diff --git a/resources/templates/provision/cisco/spa502g/{$mac}.xml b/resources/templates/provision/cisco/spa502g/{$mac}.xml
index c8898605ee..0c398ff881 100644
--- a/resources/templates/provision/cisco/spa502g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa502g/{$mac}.xml
@@ -6,8 +6,8 @@
 <Enable_Web_Server group="System/System_Configuration">Yes</Enable_Web_Server>
 <Web_Server_Port group="System/System_Configuration">80</Web_Server_Port>
 <Enable_Web_Admin_Access group="System/System_Configuration">Yes</Enable_Web_Admin_Access>
-<Admin_Passwd group="System/System_Configuration" />
-<User_Password group="System/System_Configuration" />
+<Admin_Passwd group="System/System_Configuration">{$admin_password}</Admin_Passwd>
+<User_Password group="System/System_Configuration">{$user_password}</User_Password>
 <Signaling_Protocol group="System/System_Configuration">SIP</Signaling_Protocol>
 <SPCP_Auto-detect group="System/System_Configuration">Yes</SPCP_Auto-detect>
 <Phone-UI-readonly group="System/System_Configuration">No</Phone-UI-readonly>
diff --git a/resources/templates/provision/cisco/spa504g/{$mac}.xml b/resources/templates/provision/cisco/spa504g/{$mac}.xml
index 52eddc7870..5166004d75 100644
--- a/resources/templates/provision/cisco/spa504g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa504g/{$mac}.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <flat-profile>
+<!-- System Configuration -->
+<Restricted_Access_Domains ua="na"></Restricted_Access_Domains>
+<Enable_Web_Server ua="na">Yes</Enable_Web_Server>
+<Web_Server_Port ua="na">80</Web_Server_Port>
+<Enable_Web_Admin_Access ua="na">Yes</Enable_Web_Admin_Access>
+<Admin_Passwd ua="na">{$admin_password}</Admin_Passwd>
+<User_Password ua="rw">{$user_password}</User_Password>
+<Signaling_Protocol ua="na">SIP</Signaling_Protocol> <!-- options: SIP/SPCP -->
+<SPCP_Auto-detect ua="na">Yes</SPCP_Auto-detect>
+<Phone-UI-readonly ua="na">No</Phone-UI-readonly>
+<Phone-UI-user-mode ua="na">No</Phone-UI-user-mode>
+
+<!-- Optional Network Configuration -->
 <Syslog_Server group="System/Optional_Network_Configuration" />
 <Debug_Server group="System/Optional_Network_Configuration" />
 <Debug_Level group="System/Optional_Network_Configuration">0</Debug_Level>
diff --git a/resources/templates/provision/cisco/spa508g/{$mac}.xml b/resources/templates/provision/cisco/spa508g/{$mac}.xml
index 75a77e8024..0705b378fb 100644
--- a/resources/templates/provision/cisco/spa508g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa508g/{$mac}.xml
@@ -6,8 +6,8 @@
 <Enable_Web_Server group="System/System_Configuration">Yes</Enable_Web_Server>
 <Web_Server_Port group="System/System_Configuration">80</Web_Server_Port>
 <Enable_Web_Admin_Access group="System/System_Configuration">Yes</Enable_Web_Admin_Access>
-<Admin_Passwd group="System/System_Configuration" />
-<User_Password group="System/System_Configuration" />
+<Admin_Passwd group="System/System_Configuration">{$admin_password}</Admin_Passwd>
+<User_Password group="System/System_Configuration">{$user_password}</User_Password>
 <Signaling_Protocol group="System/System_Configuration">SIP</Signaling_Protocol>
 <SPCP_Auto-detect group="System/System_Configuration">Yes</SPCP_Auto-detect>
 <Phone-UI-readonly group="System/System_Configuration">No</Phone-UI-readonly>
diff --git a/resources/templates/provision/cisco/spa509g/{$mac}.xml b/resources/templates/provision/cisco/spa509g/{$mac}.xml
index 7f212862fc..34136a1f01 100644
--- a/resources/templates/provision/cisco/spa509g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa509g/{$mac}.xml
@@ -6,8 +6,8 @@
 <Enable_Web_Server group="System/System_Configuration">Yes</Enable_Web_Server>
 <Web_Server_Port group="System/System_Configuration">80</Web_Server_Port>
 <Enable_Web_Admin_Access group="System/System_Configuration">Yes</Enable_Web_Admin_Access>
-<Admin_Passwd group="System/System_Configuration" />
-<User_Password group="System/System_Configuration" />
+<Admin_Passwd group="System/System_Configuration">{$admin_password}</Admin_Passwd>
+<User_Password group="System/System_Configuration">{$user_password}</User_Password>
 <Signaling_Protocol group="System/System_Configuration">SIP</Signaling_Protocol>
 <SPCP_Auto-detect group="System/System_Configuration">Yes</SPCP_Auto-detect>
 <Phone-UI-readonly group="System/System_Configuration">No</Phone-UI-readonly>
diff --git a/resources/templates/provision/cisco/spa512g/{$mac}.xml b/resources/templates/provision/cisco/spa512g/{$mac}.xml
index dda1ab5e5d..fb8ef943b4 100644
--- a/resources/templates/provision/cisco/spa512g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa512g/{$mac}.xml
@@ -6,8 +6,8 @@
 <Enable_Web_Server group="System/System_Configuration">Yes</Enable_Web_Server>
 <Web_Server_Port group="System/System_Configuration">80</Web_Server_Port>
 <Enable_Web_Admin_Access group="System/System_Configuration">Yes</Enable_Web_Admin_Access>
-<Admin_Passwd group="System/System_Configuration" />
-<User_Password group="System/System_Configuration" />
+<Admin_Passwd group="System/System_Configuration">{$admin_password}</Admin_Passwd>
+<User_Password group="System/System_Configuration">{$user_password}</User_Password>
 <Signaling_Protocol group="System/System_Configuration">SIP</Signaling_Protocol>
 <SPCP_Auto-detect group="System/System_Configuration">Yes</SPCP_Auto-detect>
 <Phone-UI-readonly group="System/System_Configuration">No</Phone-UI-readonly>
diff --git a/resources/templates/provision/cisco/spa514g/{$mac}.xml b/resources/templates/provision/cisco/spa514g/{$mac}.xml
index f5edbaba3e..662fe63c68 100644
--- a/resources/templates/provision/cisco/spa514g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa514g/{$mac}.xml
@@ -8,6 +8,8 @@
 <Enable_Web_Admin_Access group="System/System_Configuration">Yes</Enable_Web_Admin_Access>
 <Admin_Passwd group="System/System_Configuration" />
 <User_Password group="System/System_Configuration" />
+<Admin_Passwd group="System/System_Configuration">{$admin_password}</Admin_Passwd>
+<User_Password group="System/System_Configuration">{$user_password}</User_Password>
 <Signaling_Protocol group="System/System_Configuration">SIP</Signaling_Protocol>
 <SPCP_Auto-detect group="System/System_Configuration">Yes</SPCP_Auto-detect>
 <Phone-UI-readonly group="System/System_Configuration">No</Phone-UI-readonly>
diff --git a/resources/templates/provision/cisco/spa525g/{$mac}.xml b/resources/templates/provision/cisco/spa525g/{$mac}.xml
index 37560879b7..b93353b765 100644
--- a/resources/templates/provision/cisco/spa525g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa525g/{$mac}.xml
@@ -6,8 +6,8 @@
 <Enable_Web_Server ua="na">Yes</Enable_Web_Server>
 <Web_Server_Port ua="na">80</Web_Server_Port>
 <Enable_Web_Admin_Access ua="na">Yes</Enable_Web_Admin_Access>
-<Admin_Passwd ua="na"></Admin_Passwd>
-<User_Password ua="rw"></User_Password>
+<Admin_Passwd ua="na">{$admin_password}</Admin_Passwd>
+<User_Password ua="rw">{$user_password}</User_Password>
 <Signaling_Protocol ua="na">SIP</Signaling_Protocol> <!-- options: SIP/SPCP -->
 <SPCP_Auto-detect ua="na">Yes</SPCP_Auto-detect>
 <Phone-UI-readonly ua="na">No</Phone-UI-readonly>