diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php
index 6f32fed9c2..cc53e3a551 100644
--- a/app/devices/app_languages.php
+++ b/app/devices/app_languages.php
@@ -608,6 +608,16 @@
 		$text['label-keypad_lock']['pt-pt'] = "Bloqueio do teclado";
 		$text['label-keypad_lock']['fr-fr'] = "Verrouiller le clavier";
 
+		$text['label-automata']['en-us'] = "automata";
+		$text['label-automata']['es-cl'] = "automata";
+		$text['label-automata']['pt-pt'] = "automata";
+		$text['label-automata']['fr-fr'] = "automata";
+
+		$text['label-normal']['en-us'] = "normal";
+		$text['label-normal']['es-cl'] = "normal";
+		$text['label-normal']['pt-pt'] = "normal";
+		$text['label-normal']['fr-fr'] = "normal";
+
 	//general translations
 		$text['label-true']['en-us'] = "True";
 		$text['label-true']['es-cl'] = "Verdadero";
diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index 5430ace4a8..dd26fd05c7 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -688,7 +688,8 @@ require_once "resources/require.php";
 				<?php $found = false; ?>
 				<select class='formfld' style='width:80px;' name='device_keys[<?php echo $x; ?>][device_key_type]'>
 				<option value=''></option>
-				<?php if (strtolower($device_vendor) == "cisco" || strlen($device_vendor) == 0) {
+				<?php
+				if (strtolower($device_vendor) == "cisco" || strlen($device_vendor) == 0) {
 					if (strlen($device_vendor) == 0) { echo "<optgroup label='Cisco'>"; }
 					?>
 					<option value='line' <?php if ($row['device_key_type'] == "line") { echo $selected;$found=true; } ?>><?php echo $text['label-line'] ?></option>
@@ -716,6 +717,15 @@ require_once "resources/require.php";
 					<?php
 					if (strlen($device_vendor) == 0) { echo "</optgroup>"; }
 				}
+				if (strtolower($device_vendor) == "polycom" || strlen($device_vendor) == 0) {
+					if (strlen($device_vendor) == 0) { echo "<optgroup label='Polycom'>"; }
+					?>
+					<option value='line' <?php if ($row['device_key_type'] == "line") { echo $selected;$found=true; } ?>><?php echo $text['label-line'] ?></option>
+					<option value='automata' <?php if ($row['device_key_type'] == "automata") { echo $selected;$found=true; } ?>><?php echo $text['label-automata'] ?></option>
+					<option value='normal' <?php if ($row['device_key_type'] == "normal") { echo $selected;$found=true; } ?>><?php echo $text['label-normal'] ?></option>
+					<?php
+					if (strlen($device_vendor) == 0) { echo "</optgroup>"; }
+				}
 				if (strtolower($device_vendor) == "yealink" || strlen($device_vendor) == 0) {
 					if (strlen($device_vendor) == 0) { echo "<optgroup label='Yealink'>"; }
 					?>
diff --git a/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg b/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg
index 5a199451af..af13a1490c 100644
--- a/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg
+++ b/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg
@@ -24,6 +24,7 @@
 		reg.1.server.1.retryTimeOut="" 
 		reg.1.server.1.retryMaxCount="" 
 		reg.1.server.1.expires.lineSeize=""
+
 		reg.2.displayname="{$user_id_2}" 
 		reg.2.address="{$user_id_2}"
 		reg.2.label="{$user_id_2}" 
@@ -44,6 +45,7 @@
 		reg.2.server.1.retryTimeOut="" 
 		reg.2.server.1.retryMaxCount="" 
 		reg.2.server.1.expires.lineSeize=""
+
 		reg.3.displayName="{$user_id_3}" 
 		reg.3.address="{$user_id_3}"
 		reg.3.label="Line" 
@@ -65,25 +67,38 @@
 		reg.3.server.1.retryMaxCount="" 
 		reg.3.server.1.expires.lineSeize="" />
 
+	<attendant
+		attendant attendant.reg="1" attendant.ringType="1"
+		attendant.behaviors.display.spontaneousCallAppearances.normal="1" 
+		attendant.behaviors.display.spontaneousCallAppearances.automata="1"
+		attendant.behaviors.display.remoteCallerID.normal="1"
+		attendant.behaviors.display.remoteCallerID.automata="1" 
+
+		attendant.reg="1"
+		attendant.resourceList.1.address=""
+		attendant.resourceList.1.label="ext1"
+		attendant.resourceList.1.type="automata"
+		/>
+
 	<msg msg.bypassInstantMessage="1"> 
 		<mwi
-				msg.mwi.1.subscribe="" 
-				msg.mwi.1.callBackMode="contact" 
-				msg.mwi.1.callBack="*97" 
-				msg.mwi.2.subscribe="" 
-				msg.mwi.2.callBackMode="disabled" 
-				msg.mwi.2.callBack="" 
-				msg.mwi.3.subscribe="" 
-				msg.mwi.3.callBackMode="disabled" 
-				msg.mwi.3.callBack="" 
-				msg.mwi.4.subscribe="" 
-				msg.mwi.4.callBackMode="disabled" 
-				msg.mwi.4.callBack="" 
-				msg.mwi.5.subscribe="" 
-				msg.mwi.5.callBackMode="disabled" 
-				msg.mwi.5.callBack="" 
-				msg.mwi.6.subscribe="" 
-				msg.mwi.6.callBackMode="disabled" 
-				msg.mwi.6.callBack=""/> 
+			msg.mwi.1.subscribe="" 
+			msg.mwi.1.callBackMode="contact" 
+			msg.mwi.1.callBack="*97" 
+			msg.mwi.2.subscribe="" 
+			msg.mwi.2.callBackMode="disabled" 
+			msg.mwi.2.callBack="" 
+			msg.mwi.3.subscribe="" 
+			msg.mwi.3.callBackMode="disabled" 
+			msg.mwi.3.callBack="" 
+			msg.mwi.4.subscribe="" 
+			msg.mwi.4.callBackMode="disabled" 
+			msg.mwi.4.callBack="" 
+			msg.mwi.5.subscribe="" 
+			msg.mwi.5.callBackMode="disabled" 
+			msg.mwi.5.callBack="" 
+			msg.mwi.6.subscribe="" 
+			msg.mwi.6.callBackMode="disabled" 
+			msg.mwi.6.callBack=""/> 
 	</msg>
 </phone1>