diff --git a/resources/templates/provision/yealink/t20p/{$mac}.cfg b/resources/templates/provision/yealink/t20p/{$mac}.cfg
index cd1c26c51f..97a09fc7da 100644
--- a/resources/templates/provision/yealink/t20p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t20p/{$mac}.cfg
@@ -16,7 +16,7 @@ account.1.label = {$display_name_1}
 account.1.display_name = {$display_name_1}
 
 #Configure the username and password for register authentication.
-account.1.auth_name = {$user_id_1}
+account.1.auth_name = {$auth_id_1}
 account.1.password = {$user_password_1}
 
 #Configure the register user name.
@@ -325,7 +325,7 @@ account.2.label = {$display_name_2}
 account.2.display_name = {$display_name_2}
 
 #Configure the username and password for register authentication.
-account.2.auth_name = {$user_id_2}
+account.2.auth_name = {$auth_id_2}
 account.2.password = {$user_password_2}
 
 #Configure the register user name.
@@ -634,7 +634,7 @@ account.3.label = {$display_name_3}
 account.3.display_name = {$display_name_3}
 
 #Configure the username and password for register authentication.
-account.3.auth_name = {$user_id_3}
+account.3.auth_name = {$auth_id_3}
 account.3.password = {$user_password_3}
 
 #Configure the register user name.
@@ -943,7 +943,7 @@ account.4.label = {$display_name_4}
 account.4.display_name = {$display_name_4}
 
 #Configure the username and password for register authentication.
-account.4.auth_name = {$user_id_4}
+account.4.auth_name = {$auth_id_4}
 account.4.password = {$user_password_4}
 
 #Configure the register user name.
@@ -1255,7 +1255,7 @@ account.5.label = {$display_name_5}
 account.5.display_name = {$display_name_5}
 
 #Configure the username and password for register authentication.
-account.5.auth_name = {$user_id_5}
+account.5.auth_name = {$auth_id_5}
 account.5.password = {$user_password_5}
 
 #Configure the register user name.
@@ -1562,7 +1562,7 @@ account.6.label = {$display_name_6}
 account.6.display_name = {$display_name_6}
 
 #Configure the username and password for register authentication.
-account.6.auth_name = {$user_id_6}
+account.6.auth_name = {$auth_id_6}
 account.6.password = {$user_id_6}
 
 #Configure the register user name.
diff --git a/resources/templates/provision/yealink/t22p/{$mac}.cfg b/resources/templates/provision/yealink/t22p/{$mac}.cfg
index cd1c26c51f..97a09fc7da 100644
--- a/resources/templates/provision/yealink/t22p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t22p/{$mac}.cfg
@@ -16,7 +16,7 @@ account.1.label = {$display_name_1}
 account.1.display_name = {$display_name_1}
 
 #Configure the username and password for register authentication.
-account.1.auth_name = {$user_id_1}
+account.1.auth_name = {$auth_id_1}
 account.1.password = {$user_password_1}
 
 #Configure the register user name.
@@ -325,7 +325,7 @@ account.2.label = {$display_name_2}
 account.2.display_name = {$display_name_2}
 
 #Configure the username and password for register authentication.
-account.2.auth_name = {$user_id_2}
+account.2.auth_name = {$auth_id_2}
 account.2.password = {$user_password_2}
 
 #Configure the register user name.
@@ -634,7 +634,7 @@ account.3.label = {$display_name_3}
 account.3.display_name = {$display_name_3}
 
 #Configure the username and password for register authentication.
-account.3.auth_name = {$user_id_3}
+account.3.auth_name = {$auth_id_3}
 account.3.password = {$user_password_3}
 
 #Configure the register user name.
@@ -943,7 +943,7 @@ account.4.label = {$display_name_4}
 account.4.display_name = {$display_name_4}
 
 #Configure the username and password for register authentication.
-account.4.auth_name = {$user_id_4}
+account.4.auth_name = {$auth_id_4}
 account.4.password = {$user_password_4}
 
 #Configure the register user name.
@@ -1255,7 +1255,7 @@ account.5.label = {$display_name_5}
 account.5.display_name = {$display_name_5}
 
 #Configure the username and password for register authentication.
-account.5.auth_name = {$user_id_5}
+account.5.auth_name = {$auth_id_5}
 account.5.password = {$user_password_5}
 
 #Configure the register user name.
@@ -1562,7 +1562,7 @@ account.6.label = {$display_name_6}
 account.6.display_name = {$display_name_6}
 
 #Configure the username and password for register authentication.
-account.6.auth_name = {$user_id_6}
+account.6.auth_name = {$auth_id_6}
 account.6.password = {$user_id_6}
 
 #Configure the register user name.
diff --git a/resources/templates/provision/yealink/t26p/{$mac}.cfg b/resources/templates/provision/yealink/t26p/{$mac}.cfg
index 6c230114ef..7617077953 100644
--- a/resources/templates/provision/yealink/t26p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t26p/{$mac}.cfg
@@ -16,7 +16,7 @@ account.1.label = {$display_name_1}
 account.1.display_name = {$display_name_1}
 
 #Configure the username and password for register authentication.
-account.1.auth_name = {$user_id_1}
+account.1.auth_name = {$auth_id_1}
 account.1.password = {$user_password_1}
 
 #Configure the register user name.
@@ -325,7 +325,7 @@ account.2.label = {$display_name_2}
 account.2.display_name = {$display_name_2}
 
 #Configure the username and password for register authentication.
-account.2.auth_name = {$user_id_2}
+account.2.auth_name = {$auth_id_2}
 account.2.password = {$user_password_2}
 
 #Configure the register user name.
@@ -634,7 +634,7 @@ account.3.label = {$display_name_3}
 account.3.display_name = {$display_name_3}
 
 #Configure the username and password for register authentication.
-account.3.auth_name = {$user_id_3}
+account.3.auth_name = {$auth_id_3}
 account.3.password = {$user_password_3}
 
 #Configure the register user name.
@@ -943,7 +943,7 @@ account.4.label = {$display_name_4}
 account.4.display_name = {$display_name_4}
 
 #Configure the username and password for register authentication.
-account.4.auth_name = {$user_id_4}
+account.4.auth_name = {$auth_id_4}
 account.4.password = {$user_password_4}
 
 #Configure the register user name.
@@ -1255,7 +1255,7 @@ account.5.label = {$display_name_5}
 account.5.display_name = {$display_name_5}
 
 #Configure the username and password for register authentication.
-account.5.auth_name = {$user_id_5}
+account.5.auth_name = {$auth_id_5}
 account.5.password = {$user_password_5}
 
 #Configure the register user name.
@@ -1562,7 +1562,7 @@ account.6.label = {$display_name_6}
 account.6.display_name = {$display_name_6}
 
 #Configure the username and password for register authentication.
-account.6.auth_name = {$user_id_6}
+account.6.auth_name = {$auth_id_6}
 account.6.password = {$user_id_6}
 
 #Configure the register user name.
diff --git a/resources/templates/provision/yealink/t28p/{$mac}.cfg b/resources/templates/provision/yealink/t28p/{$mac}.cfg
index 6c230114ef..7617077953 100644
--- a/resources/templates/provision/yealink/t28p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t28p/{$mac}.cfg
@@ -16,7 +16,7 @@ account.1.label = {$display_name_1}
 account.1.display_name = {$display_name_1}
 
 #Configure the username and password for register authentication.
-account.1.auth_name = {$user_id_1}
+account.1.auth_name = {$auth_id_1}
 account.1.password = {$user_password_1}
 
 #Configure the register user name.
@@ -325,7 +325,7 @@ account.2.label = {$display_name_2}
 account.2.display_name = {$display_name_2}
 
 #Configure the username and password for register authentication.
-account.2.auth_name = {$user_id_2}
+account.2.auth_name = {$auth_id_2}
 account.2.password = {$user_password_2}
 
 #Configure the register user name.
@@ -634,7 +634,7 @@ account.3.label = {$display_name_3}
 account.3.display_name = {$display_name_3}
 
 #Configure the username and password for register authentication.
-account.3.auth_name = {$user_id_3}
+account.3.auth_name = {$auth_id_3}
 account.3.password = {$user_password_3}
 
 #Configure the register user name.
@@ -943,7 +943,7 @@ account.4.label = {$display_name_4}
 account.4.display_name = {$display_name_4}
 
 #Configure the username and password for register authentication.
-account.4.auth_name = {$user_id_4}
+account.4.auth_name = {$auth_id_4}
 account.4.password = {$user_password_4}
 
 #Configure the register user name.
@@ -1255,7 +1255,7 @@ account.5.label = {$display_name_5}
 account.5.display_name = {$display_name_5}
 
 #Configure the username and password for register authentication.
-account.5.auth_name = {$user_id_5}
+account.5.auth_name = {$auth_id_5}
 account.5.password = {$user_password_5}
 
 #Configure the register user name.
@@ -1562,7 +1562,7 @@ account.6.label = {$display_name_6}
 account.6.display_name = {$display_name_6}
 
 #Configure the username and password for register authentication.
-account.6.auth_name = {$user_id_6}
+account.6.auth_name = {$auth_id_6}
 account.6.password = {$user_id_6}
 
 #Configure the register user name.
diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg
index a9ecdf0005..7617077953 100644
--- a/resources/templates/provision/yealink/t32g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg
@@ -16,7 +16,7 @@ account.1.label = {$display_name_1}
 account.1.display_name = {$display_name_1}
 
 #Configure the username and password for register authentication.
-account.1.auth_name = {$user_id_1}
+account.1.auth_name = {$auth_id_1}
 account.1.password = {$user_password_1}
 
 #Configure the register user name.
@@ -325,7 +325,7 @@ account.2.label = {$display_name_2}
 account.2.display_name = {$display_name_2}
 
 #Configure the username and password for register authentication.
-account.2.auth_name = {$user_id_2}
+account.2.auth_name = {$auth_id_2}
 account.2.password = {$user_password_2}
 
 #Configure the register user name.
@@ -634,7 +634,7 @@ account.3.label = {$display_name_3}
 account.3.display_name = {$display_name_3}
 
 #Configure the username and password for register authentication.
-account.3.auth_name = {$user_id_3}
+account.3.auth_name = {$auth_id_3}
 account.3.password = {$user_password_3}
 
 #Configure the register user name.
@@ -943,7 +943,7 @@ account.4.label = {$display_name_4}
 account.4.display_name = {$display_name_4}
 
 #Configure the username and password for register authentication.
-account.4.auth_name = {$user_id_4}
+account.4.auth_name = {$auth_id_4}
 account.4.password = {$user_password_4}
 
 #Configure the register user name.
@@ -1255,7 +1255,7 @@ account.5.label = {$display_name_5}
 account.5.display_name = {$display_name_5}
 
 #Configure the username and password for register authentication.
-account.5.auth_name = {$user_id_5}
+account.5.auth_name = {$auth_id_5}
 account.5.password = {$user_password_5}
 
 #Configure the register user name.
@@ -1562,7 +1562,7 @@ account.6.label = {$display_name_6}
 account.6.display_name = {$display_name_6}
 
 #Configure the username and password for register authentication.
-account.6.auth_name = {$user_id_6}
+account.6.auth_name = {$auth_id_6}
 account.6.password = {$user_id_6}
 
 #Configure the register user name.
@@ -1904,6 +1904,7 @@ linekey.{$row.device_key_id}.type = {$row.device_key_type}
 linekey.{$row.device_key_id}.xml_phonebook = 
 linekey.{$row.device_key_id}.label = {$row.device_key_label}
 
+{/if}
 {/foreach}
 
 
diff --git a/resources/templates/provision/yealink/t38g/{$mac}.cfg b/resources/templates/provision/yealink/t38g/{$mac}.cfg
index 6c230114ef..7617077953 100644
--- a/resources/templates/provision/yealink/t38g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t38g/{$mac}.cfg
@@ -16,7 +16,7 @@ account.1.label = {$display_name_1}
 account.1.display_name = {$display_name_1}
 
 #Configure the username and password for register authentication.
-account.1.auth_name = {$user_id_1}
+account.1.auth_name = {$auth_id_1}
 account.1.password = {$user_password_1}
 
 #Configure the register user name.
@@ -325,7 +325,7 @@ account.2.label = {$display_name_2}
 account.2.display_name = {$display_name_2}
 
 #Configure the username and password for register authentication.
-account.2.auth_name = {$user_id_2}
+account.2.auth_name = {$auth_id_2}
 account.2.password = {$user_password_2}
 
 #Configure the register user name.
@@ -634,7 +634,7 @@ account.3.label = {$display_name_3}
 account.3.display_name = {$display_name_3}
 
 #Configure the username and password for register authentication.
-account.3.auth_name = {$user_id_3}
+account.3.auth_name = {$auth_id_3}
 account.3.password = {$user_password_3}
 
 #Configure the register user name.
@@ -943,7 +943,7 @@ account.4.label = {$display_name_4}
 account.4.display_name = {$display_name_4}
 
 #Configure the username and password for register authentication.
-account.4.auth_name = {$user_id_4}
+account.4.auth_name = {$auth_id_4}
 account.4.password = {$user_password_4}
 
 #Configure the register user name.
@@ -1255,7 +1255,7 @@ account.5.label = {$display_name_5}
 account.5.display_name = {$display_name_5}
 
 #Configure the username and password for register authentication.
-account.5.auth_name = {$user_id_5}
+account.5.auth_name = {$auth_id_5}
 account.5.password = {$user_password_5}
 
 #Configure the register user name.
@@ -1562,7 +1562,7 @@ account.6.label = {$display_name_6}
 account.6.display_name = {$display_name_6}
 
 #Configure the username and password for register authentication.
-account.6.auth_name = {$user_id_6}
+account.6.auth_name = {$auth_id_6}
 account.6.password = {$user_id_6}
 
 #Configure the register user name.
diff --git a/resources/templates/provision/yealink/vp530/{$mac}.cfg b/resources/templates/provision/yealink/vp530/{$mac}.cfg
index 8ab712e774..a2a343a8ec 100644
--- a/resources/templates/provision/yealink/vp530/{$mac}.cfg
+++ b/resources/templates/provision/yealink/vp530/{$mac}.cfg
@@ -16,7 +16,7 @@ account.1.label = {$display_name_1}
 account.1.display_name = {$display_name_1}
 
 #Configure the username and password for register authentication.
-account.1.auth_name = {$user_id_1}
+account.1.auth_name = {$auth_id_1}
 account.1.password = {$user_password_1}
 
 #Configure the register user name.
@@ -355,7 +355,7 @@ account.2.label = {$display_name_2}
 account.2.display_name = {$display_name_2}
 
 #Configure the username and password for register authentication.
-account.2.auth_name = {$user_id_2}
+account.2.auth_name = {$auth_id_2}
 account.2.password = {$user_password_2}
 
 #Configure the register user name.
@@ -694,7 +694,7 @@ account.3.label = {$display_name_3}
 account.3.display_name = {$display_name_3}
 
 #Configure the username and password for register authentication.
-account.3.auth_name = {$user_id_3}
+account.3.auth_name = {$auth_id_3}
 account.3.password = {$user_password_3}
 
 #Configure the register user name.
@@ -1033,7 +1033,7 @@ account.4.label = {$display_name_4}
 account.4.display_name = {$display_name_4}
 
 #Configure the username and password for register authentication.
-account.4.auth_name = {$user_id_4}
+account.4.auth_name = {$auth_id_4}
 account.4.password = {$user_password_4}
 
 #Configure the register user name.