diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index 77c04434c4..0653a9094d 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -1068,10 +1068,8 @@
 				$selected = "selected='selected'";
 				echo "	<select class='formfld' name='device_keys[".$x."][device_key_id]'>\n";
 				echo "	<option value=''></option>\n";
-				$i = 1;
-				while ($i < 100) {
-					echo "	<option value='$i' ".($row['device_key_id'] == $i ? $selected:"").">$i</option>\n";
-					$i++;
+				for ($i = 1; $i <= 255; $i++) {
+					echo "	<option value='$i' ".($row['device_key_id'] == $i ? "selected":null).">$i</option>\n";
 				}
 				echo "	</select>\n";
 				echo "</td>\n";
diff --git a/app/devices/device_profile_edit.php b/app/devices/device_profile_edit.php
index babc1f31b1..52bf9ae710 100644
--- a/app/devices/device_profile_edit.php
+++ b/app/devices/device_profile_edit.php
@@ -436,8 +436,8 @@
 			echo "<td valign='top' align='left' nowrap='nowrap'>\n";
 			echo "	<select class='formfld' name='device_keys[".$x."][device_key_id]'>\n";
 			echo "	<option value=''></option>\n";
-			for ($i = 1; $i <= 99; $i++) {
-				echo "	<option value='".$i."' ".(($row['device_key_id'] == $i) ? "selected='selected'" : null).">".$i."</option>\n";
+			for ($i = 1; $i <= 255; $i++) {
+				echo "	<option value='$i' ".($row['device_key_id'] == $i ? "selected":null).">$i</option>\n";
 			}
 			echo "	</select>\n";
 			echo "</td>\n";
diff --git a/resources/templates/provision/aastra/675x/{$mac}.cfg b/resources/templates/provision/aastra/675x/{$mac}.cfg
index aff6939115..0e57d5867c 100644
--- a/resources/templates/provision/aastra/675x/{$mac}.cfg
+++ b/resources/templates/provision/aastra/675x/{$mac}.cfg
@@ -24,11 +24,13 @@
 #dns2: 205.210.42.205 # cache1.dnsresolvers.com
 
 # === NTP time server settings ===
-#time server disabled: 0
-#time server1: {$domain_name}
-#time server2: pool.ntp.org
-#time server3:
+time server disabled: 0                      # 0 == enable time server    1 = disable time server
+time server1: {$ntp_server_primary}
+time server2: {$ntp_server_secondary}
 
+# === Advanced Network Settings ===
+upnp manager: 0                               # Enable/Disable Universal Plug and Play
+lldp: 0                                       # Enable/Disable Link-Layer Discovery Protocol
 
 # #################
 # Firmware Server
@@ -134,10 +136,40 @@ sip line{$row.line_number} registration period: 120    # requested registration
 # Key assignment types blf, blfxfer, park, speeddial, dnd
 # #################
 {foreach $keys as $row}
-{if $row.device_key_category == "line"}
-# {$row.device_key_label}
+{if $row.device_key_category == "programmable"}
 prgkey{$row.device_key_id} type: {$row.device_key_type}
+prgkey{$row.device_key_id} line: {$row.device_key_line}
 prgkey{$row.device_key_id} value: {$row.device_key_value}
-
+{elseif $row.device_key_category == "line"}
+topsoftkey{$row.device_key_id} type: {$row.device_key_type}
+topsoftkey{$row.device_key_id} line: {$row.device_key_line}
+topsoftkey{$row.device_key_id} value: {$row.device_key_value}
+topsoftkey{$row.device_key_id} label: {$row.device_key_label}
+{elseif $row.device_key_category == "memory"}
+softkey{$row.device_key_id} type: {$row.device_key_type}
+softkey{$row.device_key_id} line: {$row.device_key_line}
+softkey{$row.device_key_id} value: {$row.device_key_value}
+softkey{$row.device_key_id} label: {$row.device_key_label}
+{elseif $row.device_key_category == "expansion" && $row.device_key_id <= 60}
+expmod1 key{$row.device_key_id} type: {$row.device_key_type}
+expmod1 key{$row.device_key_id} line: {$row.device_key_line}
+expmod1 key{$row.device_key_id} value: {$row.device_key_value}
+expmod1 key{$row.device_key_id} label: {$row.device_key_label}
+{elseif $row.device_key_category == "expansion" && $row.device_key_id <= 120}
+expmod2 key{$row.device_key_id-60} type: {$row.device_key_type}
+expmod2 key{$row.device_key_id-60} line: {$row.device_key_line}
+expmod2 key{$row.device_key_id-60} value: {$row.device_key_value}
+expmod2 key{$row.device_key_id-60} label: {$row.device_key_label}
+{elseif $row.device_key_category == "expansion" && $row.device_key_id <= 180}
+expmod3 key{$row.device_key_id-120} type: {$row.device_key_type}
+expmod3 key{$row.device_key_id-120} line: {$row.device_key_line}
+expmod3 key{$row.device_key_id-120} value: {$row.device_key_value}
+expmod3 key{$row.device_key_id-120} label: {$row.device_key_label}
+{elseif $row.device_key_category == "expansion"}
+expmod4 key{$row.device_key_id-180} type: {$row.device_key_type}
+expmod4 key{$row.device_key_id-180} line: {$row.device_key_line}
+expmod4 key{$row.device_key_id-180} value: {$row.device_key_value}
+expmod4 key{$row.device_key_id-180} label: {$row.device_key_label}
 {/if}
 {/foreach}
+