diff --git a/app/devices/app_config.php b/app/devices/app_config.php
index d0fbc218bf..55d42ee324 100644
--- a/app/devices/app_config.php
+++ b/app/devices/app_config.php
@@ -1849,6 +1849,101 @@
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 
+
+	//avaya details
+		$y++;
+		$vendors[$y]['uuid'] = "e6a569b0-66fc-441e-acb5-a50b848ed108";
+		$vendors[$y]['name'] = "avaya";
+		$z=0;
+		$vendors[$y]['functions'][$z]['uuid'] = "1288257d-5cf5-4af9-8c89-17de0bb9a782";
+		$vendors[$y]['functions'][$z]['label'] = "label-auto_answer";
+		$vendors[$y]['functions'][$z]['type'] = "auto_answer";
+		$vendors[$y]['functions'][$z]['subtype'] = "";
+		$vendors[$y]['functions'][$z]['value'] = "autoanswer";
+		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
+		$vendors[$y]['functions'][$z]['groups'][] = "admin";
+		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "d5b39e0d-d317-423c-91aa-7d158fa38e00";
+		$vendors[$y]['functions'][$z]['label'] = "label-blf";
+		$vendors[$y]['functions'][$z]['type'] = "blf";
+		$vendors[$y]['functions'][$z]['subtype'] = "";
+		$vendors[$y]['functions'][$z]['value'] = "blf";
+		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
+		$vendors[$y]['functions'][$z]['groups'][] = "admin"; 
+		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "b531c295-6b8f-4c50-a1a2-63aefbaf91ae";
+		$vendors[$y]['functions'][$z]['label'] = "label-line";
+		$vendors[$y]['functions'][$z]['type'] = "line";
+		$vendors[$y]['functions'][$z]['subtype'] = "";
+		$vendors[$y]['functions'][$z]['value'] = "primary";
+		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
+		$vendors[$y]['functions'][$z]['groups'][] = "admin";
+		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "e7e4b34a-984f-4dc9-a537-ce9b65e74332";
+		$vendors[$y]['functions'][$z]['label'] = "label-shared_line";
+		$vendors[$y]['functions'][$z]['type'] = "shared_line";
+		$vendors[$y]['functions'][$z]['subtype'] = "";
+		$vendors[$y]['functions'][$z]['value'] = "sca";
+		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
+		$vendors[$y]['functions'][$z]['groups'][] = "admin";
+		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "bb34a14d-cf02-439c-bb0e-b4f06a3b1a0e";
+		$vendors[$y]['functions'][$z]['label'] = "label-phonelock";
+		$vendors[$y]['functions'][$z]['type'] = "phonelock";
+		$vendors[$y]['functions'][$z]['subtype'] = "";
+		$vendors[$y]['functions'][$z]['value'] = "lock";
+		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
+		$vendors[$y]['functions'][$z]['groups'][] = "admin";
+		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "ef0d69b9-fe37-49a1-a10b-16dd946766ad";
+		$vendors[$y]['functions'][$z]['label'] = "label-screensaver";
+		$vendors[$y]['functions'][$z]['type'] = "screensaver";
+		$vendors[$y]['functions'][$z]['subtype'] = "";
+		$vendors[$y]['functions'][$z]['value'] = "screensaver";
+		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
+		$vendors[$y]['functions'][$z]['groups'][] = "admin";
+		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "e55a1b78-c9b9-42bd-8716-83d93e3a0d0d";
+		$vendors[$y]['functions'][$z]['label'] = "label-speed_dial";
+		$vendors[$y]['functions'][$z]['type'] = "autodial";
+		$vendors[$y]['functions'][$z]['subtype'] = "";
+		$vendors[$y]['functions'][$z]['value'] = "autodial";
+		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
+		$vendors[$y]['functions'][$z]['groups'][] = "admin";
+		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "7d2c589a-9040-4227-9e03-4cbba5e1284c";
+		$vendors[$y]['functions'][$z]['label'] = "label-dnd";
+		$vendors[$y]['functions'][$z]['type'] = "dnd";
+		$vendors[$y]['functions'][$z]['subtype'] = "";
+		$vendors[$y]['functions'][$z]['value'] = "dnd";
+		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
+		$vendors[$y]['functions'][$z]['groups'][] = "admin";
+		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "49854081-98e0-46fd-becb-ba9496ae52c0";
+		$vendors[$y]['functions'][$z]['label'] = "label-call_forward";
+		$vendors[$y]['functions'][$z]['type'] = "callfwd";
+		$vendors[$y]['functions'][$z]['subtype'] = "";
+		$vendors[$y]['functions'][$z]['value'] = "callfwd";
+		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
+		$vendors[$y]['functions'][$z]['groups'][] = "admin";
+		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "6e1f6bd0-5caf-4958-afba-aaca87ba6bd3";
+		$vendors[$y]['functions'][$z]['label'] = "label-call_forward_noanswer";
+		$vendors[$y]['functions'][$z]['type'] = "callfwdna";
+		$vendors[$y]['functions'][$z]['subtype'] = "";
+		$vendors[$y]['functions'][$z]['value'] = "callfwdna";
+		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
+		$vendors[$y]['functions'][$z]['groups'][] = "admin";
+		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "6df5fab5-f338-42cd-bede-8d9ed1f873a5";
+		$vendors[$y]['functions'][$z]['label'] = "label-call_forward_busy";
+		$vendors[$y]['functions'][$z]['type'] = "callfwdbusy";
+		$vendors[$y]['functions'][$z]['subtype'] = "";
+		$vendors[$y]['functions'][$z]['value'] = "callfwdbusy";
+		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
+		$vendors[$y]['functions'][$z]['groups'][] = "admin";
+
+
 	//poly details
 		$y++;
 		$vendors[$y]['uuid'] = "cac9a0e3-a7d4-426a-bd6d-a14f7d6a6350";
diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php
index f81c097bdc..76a0a1b4a8 100644
--- a/app/devices/app_languages.php
+++ b/app/devices/app_languages.php
@@ -2276,6 +2276,56 @@ $text['label-call_forward']['zh-cn'] = "呼叫转移";
 $text['label-call_forward']['ja-jp'] = "電話転送";
 $text['label-call_forward']['ko-kr'] = "착신 전환";
 
+$text['label-call_forward_noanswer']['en-us'] = "Call Forward N/A";
+$text['label-call_forward_noanswer']['en-gb'] = "Call Forward N/A";
+$text['label-call_forward_noanswer']['ar-eg'] = "";
+$text['label-call_forward_noanswer']['de-at'] = "";
+$text['label-call_forward_noanswer']['de-ch'] = "";
+$text['label-call_forward_noanswer']['de-de'] = "";
+$text['label-call_forward_noanswer']['el-gr'] = "";
+$text['label-call_forward_noanswer']['es-cl'] = "";
+$text['label-call_forward_noanswer']['es-mx'] = "";
+$text['label-call_forward_noanswer']['fr-ca'] = "";
+$text['label-call_forward_noanswer']['fr-fr'] = "";
+$text['label-call_forward_noanswer']['he-il'] = "";
+$text['label-call_forward_noanswer']['it-it'] = "";
+$text['label-call_forward_noanswer']['nl-nl'] = "";
+$text['label-call_forward_noanswer']['pl-pl'] = "";
+$text['label-call_forward_noanswer']['pt-br'] = "";
+$text['label-call_forward_noanswer']['pt-pt'] = "";
+$text['label-call_forward_noanswer']['ro-ro'] = "";
+$text['label-call_forward_noanswer']['ru-ru'] = "";
+$text['label-call_forward_noanswer']['sv-se'] = "";
+$text['label-call_forward_noanswer']['uk-ua'] = "";
+$text['label-call_forward_noanswer']['zh-cn'] = "";
+$text['label-call_forward_noanswer']['ja-jp'] = "";
+$text['label-call_forward_noanswer']['ko-kr'] = "";
+
+$text['label-call_forward_busy']['en-us'] = "Call Forward Busy";
+$text['label-call_forward_busy']['en-gb'] = "Call Forward Busy";
+$text['label-call_forward_busy']['ar-eg'] = "";
+$text['label-call_forward_busy']['de-at'] = "";
+$text['label-call_forward_busy']['de-ch'] = "";
+$text['label-call_forward_busy']['de-de'] = "";
+$text['label-call_forward_busy']['el-gr'] = "";
+$text['label-call_forward_busy']['es-cl'] = "";
+$text['label-call_forward_busy']['es-mx'] = "";
+$text['label-call_forward_busy']['fr-ca'] = "";
+$text['label-call_forward_busy']['fr-fr'] = "";
+$text['label-call_forward_busy']['he-il'] = "";
+$text['label-call_forward_busy']['it-it'] = "";
+$text['label-call_forward_busy']['nl-nl'] = "";
+$text['label-call_forward_busy']['pl-pl'] = "";
+$text['label-call_forward_busy']['pt-br'] = "";
+$text['label-call_forward_busy']['pt-pt'] = "";
+$text['label-call_forward_busy']['ro-ro'] = "";
+$text['label-call_forward_busy']['ru-ru'] = "";
+$text['label-call_forward_busy']['sv-se'] = "";
+$text['label-call_forward_busy']['uk-ua'] = "";
+$text['label-call_forward_busy']['zh-cn'] = "";
+$text['label-call_forward_busy']['ja-jp'] = "";
+$text['label-call_forward_busy']['ko-kr'] = "";
+
 $text['label-conf']['en-us'] = "Conf";
 $text['label-conf']['en-gb'] = "Conf";
 $text['label-conf']['ar-eg'] = "المؤتمر";
@@ -5575,6 +5625,81 @@ $text['label-fields']['zh-cn'] = "字段";
 $text['label-fields']['ja-jp'] = "田畑";
 $text['label-fields']['ko-kr'] = "필드";
 
+$text['label-logout']['en-us'] = "Logout";
+$text['label-logout']['en-gb'] = "Logout";
+$text['label-logout']['ar-eg'] = "";
+$text['label-logout']['de-at'] = "";
+$text['label-logout']['de-ch'] = "";
+$text['label-logout']['de-de'] = "";
+$text['label-logout']['el-gr'] = "";
+$text['label-logout']['es-cl'] = "";
+$text['label-logout']['es-mx'] = "";
+$text['label-logout']['fr-ca'] = "";
+$text['label-logout']['fr-fr'] = "";
+$text['label-logout']['he-il'] = "";
+$text['label-logout']['it-it'] = "";
+$text['label-logout']['nl-nl'] = "";
+$text['label-logout']['pl-pl'] = "";
+$text['label-logout']['pt-br'] = "";
+$text['label-logout']['pt-pt'] = "";
+$text['label-logout']['ro-ro'] = "";
+$text['label-logout']['ru-ru'] = "";
+$text['label-logout']['sv-se'] = "";
+$text['label-logout']['uk-ua'] = "";
+$text['label-logout']['zh-cn'] = "";
+$text['label-logout']['ja-jp'] = "";
+$text['label-logout']['ko-kr'] = "";
+
+$text['label-screensaver']['en-us'] = "Screensaver";
+$text['label-screensaver']['en-gb'] = "Screensaver";
+$text['label-screensaver']['ar-eg'] = "";
+$text['label-screensaver']['de-at'] = "";
+$text['label-screensaver']['de-ch'] = "";
+$text['label-screensaver']['de-de'] = "";
+$text['label-screensaver']['el-gr'] = "";
+$text['label-screensaver']['es-cl'] = "";
+$text['label-screensaver']['es-mx'] = "";
+$text['label-screensaver']['fr-ca'] = "";
+$text['label-screensaver']['fr-fr'] = "";
+$text['label-screensaver']['he-il'] = "";
+$text['label-screensaver']['it-it'] = "";
+$text['label-screensaver']['nl-nl'] = "";
+$text['label-screensaver']['pl-pl'] = "";
+$text['label-screensaver']['pt-br'] = "";
+$text['label-screensaver']['pt-pt'] = "";
+$text['label-screensaver']['ro-ro'] = "";
+$text['label-screensaver']['ru-ru'] = "";
+$text['label-screensaver']['sv-se'] = "";
+$text['label-screensaver']['uk-ua'] = "";
+$text['label-screensaver']['zh-cn'] = "";
+$text['label-screensaver']['ja-jp'] = "";
+$text['label-screensaver']['ko-kr'] = "";
+
+$text['label-recents']['en-us'] = "Recents";
+$text['label-recents']['en-gb'] = "Recents";
+$text['label-recents']['ar-eg'] = "";
+$text['label-recents']['de-at'] = "";
+$text['label-recents']['de-ch'] = "";
+$text['label-recents']['de-de'] = "";
+$text['label-recents']['el-gr'] = "";
+$text['label-recents']['es-cl'] = "";
+$text['label-recents']['es-mx'] = "";
+$text['label-recents']['fr-ca'] = "";
+$text['label-recents']['fr-fr'] = "";
+$text['label-recents']['he-il'] = "";
+$text['label-recents']['it-it'] = "";
+$text['label-recents']['nl-nl'] = "";
+$text['label-recents']['pl-pl'] = "";
+$text['label-recents']['pt-br'] = "";
+$text['label-recents']['pt-pt'] = "";
+$text['label-recents']['ro-ro'] = "";
+$text['label-recents']['ru-ru'] = "";
+$text['label-recents']['sv-se'] = "";
+$text['label-recents']['uk-ua'] = "";
+$text['label-recents']['zh-cn'] = "";
+$text['label-recents']['ja-jp'] = "";
+$text['label-recents']['ko-kr'] = "";
+
 $text['header-device_import']['en-us'] = "Device Import";
 $text['header-device_import']['en-gb'] = "Device Import";
 $text['header-device_import']['ar-eg'] = "استيراد الجهاز";
diff --git a/resources/templates/provision/avaya/J100Supgrade.txt b/resources/templates/provision/avaya/J100Supgrade.txt
new file mode 100644
index 0000000000..bb20a27000
--- /dev/null
+++ b/resources/templates/provision/avaya/J100Supgrade.txt
@@ -0,0 +1 @@
+GET $MACADDR.txt
\ No newline at end of file
diff --git a/resources/templates/provision/avaya/J169/{$mac}.cfg b/resources/templates/provision/avaya/J169/{$mac}.cfg
new file mode 100644
index 0000000000..3ab4b5df63
--- /dev/null
+++ b/resources/templates/provision/avaya/J169/{$mac}.cfg
@@ -0,0 +1,176 @@
+## Phone firmware
+SET APPNAME "{if isset($avaya_j169_firmware_filename)}{$avaya_j169_firmware_filename}{else}FW_S_J169_R4_0_2_1_3.bin{/if}"
+## JEM24 Expansion Module firmware
+SET "{if isset($avaya_jem24_firmware_filename)}{$avaya_jem24_firmware_filename}{else}JEM24_APPNAME FW_JEM24_R1_0_1_0_8.bin{/if}"
+
+## Trust public certs rather than the phone downloading a trusted cert from the server
+SET ENABLE_PUBLIC_CA_CERTS 1
+
+## Set Admin Access
+## 27238 is the Avaya default
+SET ENABLE_WEBSERVER 1
+SET FORCE_WEB_ADMIN_PASSWORD "{if isset($admin_password)}{$admin_password}{else}27238{/if}"
+
+SET SHA2CAPABLE 1
+SET ENABLE_PRESENCE 0
+
+## Codec Settings
+SET ENABLE_G729 0
+SET ENABLE_G722 0
+SET ENABLE_G726 0
+SET ENABLE_OPUS 0
+SET CODEC_PRIORITY G711U
+
+## Call forwarding allowed
+## 1 = permits unconditional call forwarding
+## 2 = permits call forwarding on busy
+## 4 = permits call forwarding on no answer
+## add the numbers above to get your desired combination
+## 7 means 1+2+4 
+SET CALLFWDSTAT 7
+
+## Allow the phone to be locked
+SET ENABLE_PHONE_LOCK 1
+
+## DISABLE Avaya Spaces
+SET SPACES_ACCESS_MODE 0
+
+SET CALL_PICKUP_BARGEIN_FAC *33
+
+SET ENCRYPT_VERSION_IN_USE 1
+SET MAX__DISPLAYED_SESSION_APPEARANCES 3
+SET ENHDIALSTAT 0
+
+## Specifies the screen mode used on the phone
+## 0 = Non-forced Half Screen mode
+## 1 = Non-forced Full Screen mode
+## 2 = Forced Half Screen mode is used
+## 3 = Forced Full Screen mode
+SET PHONE_SCREEN_MODE 2
+
+## Specifies the scrolling mode used on the phone
+## 0 = Line scrolling mode
+## 1 = Page scrolling mode
+SET SCROLLING_MODE 1
+
+SET OVERRIDE_USER_SELECTION ""
+
+SET USER_LOGGED_IN 1
+
+SET LANGUAGE_FILE_IN_USE Mlf_English.xml
+SET LANGUAGES_RESOURCE_LIST English=res://Mlf_English.xml,Canadian French=lang/Mlf_J169_J179_CanadianFrench.xml,Latin American Spanish=lang/Mlf_J169_J179_LatinAmericanSpanish.xml,Brazilian Portuguese=lang/Mlf_J169_J179_BrazilianPortuguese.xml,Italian=lang/Mlf_J169_J179_Italian.xml
+SET SYSTEM_LANGUAGE Mlf_J169_J179_English.xml
+SET LANGUAGE_IN_USE English
+SET LANGUAGES Mlf_J169_J179_CanadianFrench.xml,Mlf_J169_J179_LatinAmericanSpanish.xml,Mlf_J169_J179_BrazilianPortuguese.xml,Mlf_J169_J179_Italian.xml
+
+## DIALING_MODE_DEFAULT
+## 0 - Automatic
+## 1 - Manual
+SET DIALING_MODE_DEFAULT 0
+## Dialplan
+## |: This character is used to separate each different number pattern.
+## X: This character is a wildcard for any single digit match.
+## [ ]- Square brackets can be used to contain possible specific single digit matches. For example:
+##     [1237] matches 1, 2, 3 or 7. A - character can be used to match a range of digits.
+##     [1-4] matches any digit from 1 to 4.
+SET DIALPLAN "{if isset($avaya_dialplan)}{$avaya_dialplan}{else}XXX|XXXX,*XX,1XXXXXXXXXX,XXXXXXXXXX{/if}"
+## INTER_DIGIT_TIMEOUT - Set the number of seconds from the last digit dialed after which the phone assumes dialing is complete and send the digits dialed to the system
+SET INTER_DIGIT_TIMEOUT 2
+
+## 	GMTOFFSET
+SET GMTOFFSET "{if isset($avaya_time_zone)}{$avaya_time_zone}{else}-5:00{/if}"
+## Time format
+##  0 - 12hr, 1 - 24h, 2 - 12hr forced, 3 - 24h forced
+SET ADMINTIMEFORMAT 0
+## DST start date. Default: 2SunMar2L
+SET DSTSTART "{if isset($avaya_dst_start)}{$avaya_dst_start}{else}2SunMar2L{/if}"
+## DST stop date. Default: 1SunNov2L
+SET DSTSTOP "{if isset($avaya_dst_stop)}{$avaya_dst_stop}{else}1SunNov2L{/if}"
+
+SET ENABLE_SHOW_EMERG_SK 0
+SET ENABLE_SHOW_EMERG_SK_UNREG 0
+SET DISCOVER_AVAYA_ENVIRONMENT 0
+SET TCP_KEEP_ALIVE_TIME 30
+SET DTMF_PAYLOAD_TYPE 101
+SET RTP_PORT_LOW 40750
+SET RTP_PORT_RANGE 10000
+
+## User Key customization
+## 0 - Blocked, 1 - Limited (User customization is allowed for Applications and Contacts), 2 - Full
+SET CUSTOMIZATION_MODE {if isset($avaya_key_customization)}{$avaya_key_customization}{else}0{/if}
+
+## Specifies whether the Auto Answer feature is available to users.
+SET ENABLE_AUTO_ANSWER_SUPPORT 1
+
+## Voicemail access code
+SET PSTN_VM_NUM *97
+
+## BACKGROUND_IMAGE - The selected image
+## BACKGROUND_IMAGE_AVAILABLE - The list of available images
+{if isset($avaya_j179_wallpaper)}
+SET BACKGROUND_IMAGE "{$avaya_j179_wallpaper}"
+SET BACKGROUND_IMAGE_AVAILABLE "{$avaya_j169_wallpaper}"
+SET BACKGROUND_IMAGE_DISPLAY "{$avaya_j169_wallpaper}"
+{/if}
+{if isset($avaya_jem24_wallpaper)}
+SET BACKGROUND_IMAGE_AVAILABLE_JEM "{$avaya_jem24_wallpaper}"
+SET SCREENSAVER_IMAGE_AVAILABLE_JEM "{$avaya_jem24_wallpaper}"
+{/if}
+
+## Disable Avaya Mode
+SET ENABLE_IPOFFICE 0
+SET ENABLE_AVAYA_ENVIRONMENT 0
+SET ENABLE_3PCC_ENVIRONMENT 1
+SET 3PCC_SERVER_MODE 0
+
+SET DES_BLOCK 1
+SET DES_SUPPORT 0
+SET DES_STAT 0
+SET BLF_LIST_URI_CURRENT BLFfakegroup
+{if isset($avaya_directory_url)}SET DOWNLOADABLE_DIRECTORY {$avaya_directory_url}{/if}
+SET ENABLE_RCV_CONFERENCE 0
+
+{foreach $lines as $row}
+SET FORCE_SIP_EXTENSION {$row.user_id}
+SET FORCE_SIP_USERNAME {$row.user_id}
+SET FORCE_SIP_PASSWORD {$row.password}
+
+SET SIP_USER_ACCOUNT {$row.user_id}@{$row.server_address}
+SET SIP_USER_ID {$row.user_id}
+
+SET SNTPSRVR "{if isset($avaya_ntp_server)}{$avaya_ntp_server}{else}ca.pool.ntp.org{/if}"
+
+SET SIP_CONTROLLER_LIST {$row.server_address}:{$row.sip_port};transport={$row.sip_transport}
+SET SIPPROXYSRVR_IN_USE {$row.server_address}
+SET SIP_PROXY_SELECTION_POLICY 1
+SET SIPDOMAIN {$row.server_address}
+SET MWISRVR {$row.server_address}
+SET RTCPMON {$row.server_address}
+SET SIMULTANEOUS_REGISTRATIONS 1
+
+{if $row@index eq 2}{break}{/if}
+{/foreach}
+
+## Button config
+## Type can be feature,application,line,autodial
+## Name is the name of the button type. All options can be found here: https://documentation.avaya.com/bundle/InstallandAdminJ100seriesIPPhonein3PCCsetup_r4.0.11/page/PHONEKEY_parameter_values__3PCC_.html
+## attr1 is usually the specific data for the button. For example extension number
+{foreach $keys["line"] as $row}
+
+{if in_array($row.device_key_type, array("callfwd", "callfwdna", "callfwdbusy", "dnd" , "autoanswer"))}
+SET PHONEKEY "Key={$row.device_key_id};Type=feature;Name={$row.device_key_type};Label={$row.device_key_label};Forced"
+
+{elseif in_array($row.device_key_type, array("blf"))}
+SET PHONEKEY "Key={$row.device_key_id};Type=feature;Name={$row.device_key_type};Label={$row.device_key_label};attr1={$row.device_key_value};attr2={$row.device_key_value};Forced"
+
+{elseif in_array($row.device_key_type, array("lock", "logout", "screensaver"))}
+SET PHONEKEY "Key={$row.device_key_id};Type=application;Name={$row.device_key_type};Label={$row.device_key_label};Forced"
+
+{elseif in_array($row.device_key_type, array("primary"))}
+SET PHONEKEY "Key={$row.device_key_id};Type=line;Name={$row.device_key_type};attr1={$row.device_key_line};Forced"
+
+{elseif in_array($row.device_key_type, array("autodial"))}
+SET PHONEKEY "Key={$row.device_key_id};Type=autodial;Name={$row.device_key_type};attr1={$row.device_key_value};Forced"
+
+{/if}
+{/foreach}
diff --git a/resources/templates/provision/avaya/J179/{$mac}.cfg b/resources/templates/provision/avaya/J179/{$mac}.cfg
new file mode 100644
index 0000000000..64755f10e2
--- /dev/null
+++ b/resources/templates/provision/avaya/J179/{$mac}.cfg
@@ -0,0 +1,176 @@
+## Phone firmware
+SET APPNAME "{if isset($avaya_j179_firmware_filename)}{$avaya_j179_firmware_filename}{else}FW_S_J179_R4_0_2_1_3.bin{/if}"
+## JEM24 Expansion Module firmware
+SET "{if isset($avaya_jem24_firmware_filename)}{$avaya_jem24_firmware_filename}{else}JEM24_APPNAME FW_JEM24_R1_0_1_0_8.bin{/if}"
+
+## Trust public certs rather than the phone downloading a trusted cert from the server
+SET ENABLE_PUBLIC_CA_CERTS 1
+
+## Set Admin Access
+## 27238 is the Avaya default
+SET ENABLE_WEBSERVER 1
+SET FORCE_WEB_ADMIN_PASSWORD "{if isset($admin_password)}{$admin_password}{else}27238{/if}"
+
+SET SHA2CAPABLE 1
+SET ENABLE_PRESENCE 0
+
+## Codec Settings
+SET ENABLE_G729 0
+SET ENABLE_G722 0
+SET ENABLE_G726 0
+SET ENABLE_OPUS 0
+SET CODEC_PRIORITY G711U
+
+## Call forwarding allowed
+## 1 = permits unconditional call forwarding
+## 2 = permits call forwarding on busy
+## 4 = permits call forwarding on no answer
+## add the numbers above to get your desired combination
+## 7 means 1+2+4 
+SET CALLFWDSTAT 7
+
+## Allow the phone to be locked
+SET ENABLE_PHONE_LOCK 1
+
+## DISABLE Avaya Spaces
+SET SPACES_ACCESS_MODE 0
+
+SET CALL_PICKUP_BARGEIN_FAC *33
+
+SET ENCRYPT_VERSION_IN_USE 1
+SET MAX__DISPLAYED_SESSION_APPEARANCES 3
+SET ENHDIALSTAT 0
+
+## Specifies the screen mode used on the phone
+## 0 = Non-forced Half Screen mode
+## 1 = Non-forced Full Screen mode
+## 2 = Forced Half Screen mode is used
+## 3 = Forced Full Screen mode
+SET PHONE_SCREEN_MODE 2
+
+## Specifies the scrolling mode used on the phone
+## 0 = Line scrolling mode
+## 1 = Page scrolling mode
+SET SCROLLING_MODE 1
+
+SET OVERRIDE_USER_SELECTION ""
+
+SET USER_LOGGED_IN 1
+
+SET LANGUAGE_FILE_IN_USE Mlf_English.xml
+SET LANGUAGES_RESOURCE_LIST English=res://Mlf_English.xml,Canadian French=lang/Mlf_J169_J179_CanadianFrench.xml,Latin American Spanish=lang/Mlf_J169_J179_LatinAmericanSpanish.xml,Brazilian Portuguese=lang/Mlf_J169_J179_BrazilianPortuguese.xml,Italian=lang/Mlf_J169_J179_Italian.xml
+SET SYSTEM_LANGUAGE Mlf_J169_J179_English.xml
+SET LANGUAGE_IN_USE English
+SET LANGUAGES Mlf_J169_J179_CanadianFrench.xml,Mlf_J169_J179_LatinAmericanSpanish.xml,Mlf_J169_J179_BrazilianPortuguese.xml,Mlf_J169_J179_Italian.xml
+
+## DIALING_MODE_DEFAULT
+## 0 - Automatic
+## 1 - Manual
+SET DIALING_MODE_DEFAULT 0
+## Dialplan
+## |: This character is used to separate each different number pattern.
+## X: This character is a wildcard for any single digit match.
+## [ ]- Square brackets can be used to contain possible specific single digit matches. For example:
+##     [1237] matches 1, 2, 3 or 7. A - character can be used to match a range of digits.
+##     [1-4] matches any digit from 1 to 4.
+SET DIALPLAN "{if isset($avaya_dialplan)}{$avaya_dialplan}{else}XXX|XXXX,*XX,1XXXXXXXXXX,XXXXXXXXXX{/if}"
+## INTER_DIGIT_TIMEOUT - Set the number of seconds from the last digit dialed after which the phone assumes dialing is complete and send the digits dialed to the system
+SET INTER_DIGIT_TIMEOUT 2
+
+## 	GMTOFFSET
+SET GMTOFFSET "{if isset($avaya_time_zone)}{$avaya_time_zone}{else}-5:00{/if}"
+## Time format
+##  0 - 12hr, 1 - 24h, 2 - 12hr forced, 3 - 24h forced
+SET ADMINTIMEFORMAT 0
+## DST start date. Default: 2SunMar2L
+SET DSTSTART "{if isset($avaya_dst_start)}{$avaya_dst_start}{else}2SunMar2L{/if}"
+## DST stop date. Default: 1SunNov2L
+SET DSTSTOP "{if isset($avaya_dst_stop)}{$avaya_dst_stop}{else}1SunNov2L{/if}"
+
+SET ENABLE_SHOW_EMERG_SK 0
+SET ENABLE_SHOW_EMERG_SK_UNREG 0
+SET DISCOVER_AVAYA_ENVIRONMENT 0
+SET TCP_KEEP_ALIVE_TIME 30
+SET DTMF_PAYLOAD_TYPE 101
+SET RTP_PORT_LOW 40750
+SET RTP_PORT_RANGE 10000
+
+## User Key customization
+## 0 - Blocked, 1 - Limited (User customization is allowed for Applications and Contacts), 2 - Full
+SET CUSTOMIZATION_MODE {if isset($avaya_key_customization)}{$avaya_key_customization}{else}0{/if}
+
+## Specifies whether the Auto Answer feature is available to users.
+SET ENABLE_AUTO_ANSWER_SUPPORT 1
+
+## Voicemail access code
+SET PSTN_VM_NUM *97
+
+## BACKGROUND_IMAGE - The selected image
+## BACKGROUND_IMAGE_AVAILABLE - The list of available images
+{if isset($avaya_j179_wallpaper)}
+SET BACKGROUND_IMAGE "{$avaya_j179_wallpaper}"
+SET BACKGROUND_IMAGE_AVAILABLE "{$avaya_j179_wallpaper}"
+SET BACKGROUND_IMAGE_DISPLAY "{$avaya_j179_wallpaper}"
+{/if}
+{if isset($avaya_jem24_wallpaper)}
+SET BACKGROUND_IMAGE_AVAILABLE_JEM "{$avaya_jem24_wallpaper}"
+SET SCREENSAVER_IMAGE_AVAILABLE_JEM "{$avaya_jem24_wallpaper}"
+{/if}
+
+## Disable Avaya Mode
+SET ENABLE_IPOFFICE 0
+SET ENABLE_AVAYA_ENVIRONMENT 0
+SET ENABLE_3PCC_ENVIRONMENT 1
+SET 3PCC_SERVER_MODE 0
+
+SET DES_BLOCK 1
+SET DES_SUPPORT 0
+SET DES_STAT 0
+SET BLF_LIST_URI_CURRENT BLFfakegroup
+{if isset($avaya_directory_url)}SET DOWNLOADABLE_DIRECTORY {$avaya_directory_url}{/if}
+SET ENABLE_RCV_CONFERENCE 0
+
+{foreach $lines as $row}
+SET FORCE_SIP_EXTENSION {$row.user_id}
+SET FORCE_SIP_USERNAME {$row.user_id}
+SET FORCE_SIP_PASSWORD {$row.password}
+
+SET SIP_USER_ACCOUNT {$row.user_id}@{$row.server_address}
+SET SIP_USER_ID {$row.user_id}
+
+SET SNTPSRVR "{if isset($avaya_ntp_server)}{$avaya_ntp_server}{else}ca.pool.ntp.org{/if}"
+
+SET SIP_CONTROLLER_LIST {$row.server_address}:{$row.sip_port};transport={$row.sip_transport}
+SET SIPPROXYSRVR_IN_USE {$row.server_address}
+SET SIP_PROXY_SELECTION_POLICY 1
+SET SIPDOMAIN {$row.server_address}
+SET MWISRVR {$row.server_address}
+SET RTCPMON {$row.server_address}
+SET SIMULTANEOUS_REGISTRATIONS 1
+
+{if $row@index eq 2}{break}{/if}
+{/foreach}
+
+## Button config
+## Type can be feature,application,line,autodial
+## Name is the name of the button type. All options can be found here: https://documentation.avaya.com/bundle/InstallandAdminJ100seriesIPPhonein3PCCsetup_r4.0.11/page/PHONEKEY_parameter_values__3PCC_.html
+## attr1 is usually the specific data for the button. For example extension number
+{foreach $keys["line"] as $row}
+
+{if in_array($row.device_key_type, array("callfwd", "callfwdna", "callfwdbusy", "dnd" , "autoanswer"))}
+SET PHONEKEY "Key={$row.device_key_id};Type=feature;Name={$row.device_key_type};Label={$row.device_key_label};Forced"
+
+{elseif in_array($row.device_key_type, array("blf"))}
+SET PHONEKEY "Key={$row.device_key_id};Type=feature;Name={$row.device_key_type};Label={$row.device_key_label};attr1={$row.device_key_value};attr2={$row.device_key_value};Forced"
+
+{elseif in_array($row.device_key_type, array("lock", "logout", "screensaver"))}
+SET PHONEKEY "Key={$row.device_key_id};Type=application;Name={$row.device_key_type};Label={$row.device_key_label};Forced"
+
+{elseif in_array($row.device_key_type, array("primary"))}
+SET PHONEKEY "Key={$row.device_key_id};Type=line;Name={$row.device_key_type};attr1={$row.device_key_line};Forced"
+
+{elseif in_array($row.device_key_type, array("autodial"))}
+SET PHONEKEY "Key={$row.device_key_id};Type=autodial;Name={$row.device_key_type};attr1={$row.device_key_value};Forced"
+
+{/if}
+{/foreach}