diff --git a/assets/linksys-spa5xx-configtemplate.tt b/assets/linksys-spa5xx-configtemplate.tt
index 1a0e322313..f6701c6170 100644
--- a/assets/linksys-spa5xx-configtemplate.tt
+++ b/assets/linksys-spa5xx-configtemplate.tt
@@ -30,7 +30,7 @@
         <Short_Name_[% key %]_>[% line.displayname %]</Short_Name_[% key %]_>
         <Share_Call_Appearance_[% key %]_>[% line.type == "shared" ? line.type : "private" %]</Share_Call_Appearance_[% key %]_>
         [% IF line.type == "blf" -%]
-          <Extended_Function_[% key %]_>fnc=blf+cp+sd;sub=[% line.username %]@[% line.domain %]</Extended_Function_[% key %]_>
+          <Extended_Function_[% key %]_>fnc=blf+cp+sd;sub=[% line.username %]@[% line.domain %];ext=[% line.extension %]@[% line.domain %]</Extended_Function_[% key %]_>
         [% ELSIF line.type == "shared" && barge_in == 0 -%]
           <SCA_Barge-In_Enable>Yes</SCA_Barge-In_Enable>
           [% barge_in = 1 -%]
@@ -53,9 +53,9 @@
           <Extension_[% key %]_>Disabled</Extension_[% key %]_>
         [% END -%]
       [% ELSIF range.name == "Attendant Console 1" -%]
-        <Unit_1_Key_[% key %]>fnc=sd+cp+blf;sub=[% line.username %]@[% line.domain %]</Unit_1_Key_[% key %]>
+        <Unit_1_Key_[% key %]>fnc=sd+cp+blf;sub=[% line.username %]@[% line.domain %];ext=[% line.extension %]@[% line.domain %]</Unit_1_Key_[% key %]>
       [% ELSIF range.name == "Attendant Console 2" -%]
-        <Unit_2_Key_[% key %]>fnc=sd+cp+blf;sub=[% line.username %]@[% line.domain %]</Unit_2_Key_[% key %]>
+        <Unit_2_Key_[% key %]>fnc=sd+cp+blf;sub=[% line.username %]@[% line.domain %];ext=[% line.extension %]@[% line.domain %]</Unit_2_Key_[% key %]>
       [% END -%]
     [% END -%]
     [% FOR key IN [1 .. range.num_lines] -%]
diff --git a/lib/NGCP/Panel/Controller/Device.pm b/lib/NGCP/Panel/Controller/Device.pm
index 89cc97aaa7..37f5c16d37 100644
--- a/lib/NGCP/Panel/Controller/Device.pm
+++ b/lib/NGCP/Panel/Controller/Device.pm
@@ -1028,6 +1028,7 @@ sub dev_field_config :Chained('/') :PathPart('device/autoprov/config') :Args() {
             };
             # TODO: only push password for private/shared line?
             push @{ $range->{lines} }, {
+                extension => $sub->pbx_extension,
                 username => $sub->username,
                 domain => $sub->domain->domain,
                 password => $sub->password,