diff --git a/lib/NGCP/Panel/Controller/Subscriber.pm b/lib/NGCP/Panel/Controller/Subscriber.pm
index 4e7d54046e..a4ab12f46b 100644
--- a/lib/NGCP/Panel/Controller/Subscriber.pm
+++ b/lib/NGCP/Panel/Controller/Subscriber.pm
@@ -1861,7 +1861,7 @@ sub edit_master :Chained('master') :PathPart('edit') :Args(0) :Does(ACL) :ACLDet
                 }
 
                 if($subscriber->primary_number) {
-                    if($pbx_ext && !$is_admin) {
+                    if($pbx_ext) {
                         $form->params->{e164}{cc} = $subscriber->primary_number->cc;
                         $form->params->{e164}{ac} = $subscriber->primary_number->ac;
                         $form->params->{e164}{sn} = $base_number->{sn} . $form->params->{extension};
diff --git a/lib/NGCP/Panel/Form/Customer/PbxExtensionSubscriberEditAdmin.pm b/lib/NGCP/Panel/Form/Customer/PbxExtensionSubscriberEditAdmin.pm
index 2f2829c66f..981fd9a7c3 100644
--- a/lib/NGCP/Panel/Form/Customer/PbxExtensionSubscriberEditAdmin.pm
+++ b/lib/NGCP/Panel/Form/Customer/PbxExtensionSubscriberEditAdmin.pm
@@ -6,19 +6,6 @@ extends 'NGCP::Panel::Form::Customer::PbxExtensionSubscriberEdit';
 
 with 'NGCP::Panel::Render::RepeatableJs';
 
-has_field 'extension' => (
-    required => 0,
-);
-
-has_field 'e164' => (
-    type => '+NGCP::Panel::Field::E164',
-    order => 99,
-    required => 0,
-    label => 'E164 Number',
-    do_label => 1,
-    do_wrapper => 1,
-);
-
 has_field 'alias_number' => (
     type => '+NGCP::Panel::Field::AliasNumber',
     setup_for_js => 1,
@@ -40,7 +27,7 @@ has_field 'alias_number_add' => (
 has_block 'fields' => (
     tag => 'div',
     class => [qw/modal-body/],
-    render_list => [qw/group e164 alias_number alias_number_add display_name webusername webpassword password status external_id/ ],
+    render_list => [qw/group extension alias_number alias_number_add display_name webusername webpassword password status external_id/ ],
 );
 
 1;