diff --git a/lib/NGCP/Panel/Field/E164.pm b/lib/NGCP/Panel/Field/E164.pm
index 62941dc321..e8c4e1e194 100644
--- a/lib/NGCP/Panel/Field/E164.pm
+++ b/lib/NGCP/Panel/Field/E164.pm
@@ -1,5 +1,4 @@
 package NGCP::Panel::Field::E164;
-use Moose;
 use HTML::FormHandler::Moose;
 extends 'HTML::FormHandler::Field::Compound';
 
diff --git a/lib/NGCP/Panel/Field/E164Range.pm b/lib/NGCP/Panel/Field/E164Range.pm
index 4a929269b2..be464c1290 100644
--- a/lib/NGCP/Panel/Field/E164Range.pm
+++ b/lib/NGCP/Panel/Field/E164Range.pm
@@ -1,5 +1,4 @@
 package NGCP::Panel::Field::E164Range;
-use Moose;
 use HTML::FormHandler::Moose;
 extends 'HTML::FormHandler::Field::Compound';
 
@@ -15,7 +14,6 @@ has_field 'cc' => (
     },
     do_label => 0,
     do_wrapper => 0,
-    required => 1,
 );
 
 has_field 'ac' => (
@@ -27,7 +25,6 @@ has_field 'ac' => (
     },
     do_label => 0,
     do_wrapper => 0,
-    required => 0,
 );
 
 has_field 'snbase' => (
@@ -39,7 +36,6 @@ has_field 'snbase' => (
     },
     do_label => 0,
     do_wrapper => 0,
-    required => 1,
 );
 
 has_field 'snlength' => (
@@ -51,7 +47,6 @@ has_field 'snlength' => (
     },
     do_label => 0,
     do_wrapper => 0,
-    required => 1,
 );
 
 sub validate {
diff --git a/lib/NGCP/Panel/Field/E164RangeRepeat.pm b/lib/NGCP/Panel/Field/E164RangeRepeat.pm
index ab30d03e8e..46e8ec0340 100644
--- a/lib/NGCP/Panel/Field/E164RangeRepeat.pm
+++ b/lib/NGCP/Panel/Field/E164RangeRepeat.pm
@@ -1,5 +1,4 @@
 package NGCP::Panel::Field::E164RangeRepeat;
-use Moose;
 use HTML::FormHandler::Moose;
 extends 'HTML::FormHandler::Field::Repeatable';
 
diff --git a/lib/NGCP/Panel/Field/PosInteger.pm b/lib/NGCP/Panel/Field/PosInteger.pm
index e7736b6f6a..c4234821eb 100644
--- a/lib/NGCP/Panel/Field/PosInteger.pm
+++ b/lib/NGCP/Panel/Field/PosInteger.pm
@@ -1,7 +1,7 @@
 package NGCP::Panel::Field::PosInteger;
-use Moose;
+use HTML::FormHandler::Moose;
 use Sipwise::Base;
-use base 'HTML::FormHandler::Field::Integer';
+extends 'HTML::FormHandler::Field::Integer';
 
 sub validate {
     my ( $self ) = @_;
diff --git a/lib/NGCP/Panel/Utils/Subscriber.pm b/lib/NGCP/Panel/Utils/Subscriber.pm
index 2260bcb17e..a2d51c5a19 100644
--- a/lib/NGCP/Panel/Utils/Subscriber.pm
+++ b/lib/NGCP/Panel/Utils/Subscriber.pm
@@ -264,12 +264,20 @@ sub create_subscriber {
             foreach my $range(@{ $params->{e164range} }) {
                 if(defined $range->{e164range}{cc} && $range->{e164range}{cc} ne '') {
                     my $len = $range->{e164range}{snlength};
-                    foreach my $ext(0 .. int("9" x $len)) {
-                        $range->{e164range}{sn} = sprintf("%s%0".$len."d", $range->{e164range}{snbase}, $ext);
+                    if ($len) {
+                        foreach my $ext(0 .. int("9" x $len)) {
+                            $range->{e164range}{sn} = sprintf("%s%0".$len."d", $range->{e164range}{snbase}, $ext);
+                            push @alias_numbers, { e164 => {
+                                cc => $range->{e164range}{cc},
+                                ac => $range->{e164range}{ac},
+                                sn => $range->{e164range}{sn},
+                            }};
+                        }
+                    } else {
                         push @alias_numbers, { e164 => {
                             cc => $range->{e164range}{cc},
                             ac => $range->{e164range}{ac},
-                            sn => $range->{e164range}{sn},
+                            sn => $range->{e164range}{snbase},
                         }};
                     }
                 }