diff --git a/lib/NGCP/Panel/Form/PasswordResetAPI.pm b/lib/NGCP/Panel/Form/PasswordResetAPI.pm
index 1a12c97fb6..7959ca06a9 100644
--- a/lib/NGCP/Panel/Form/PasswordResetAPI.pm
+++ b/lib/NGCP/Panel/Form/PasswordResetAPI.pm
@@ -38,25 +38,12 @@ sub validate {
     return unless $c;
 
     my $resource = Storable::dclone($self->values);
-    if ($resource->{type} eq 'administrator') {
-        my $address = $resource->{username}.'@ngcp.local';
-        unless (Email::Valid->address($address)) {
-            my $err = "'username' is not valid.";
-            $c->log->error($err);
-            $self->field('username')->add_error($err);
-        }
-    }
-    elsif ($resource->{type} eq 'subscriber') {
+    $c->log->debug($resource->{type} . " password reset attempt for '$resource->{username}'");
+    if ($resource->{type} eq 'subscriber') {
         my $err;
         if (!$resource->{domain}) {
             $err = "'domain' field is required when requesting a password reset for a subscriber";
         }
-        else {
-            my $address = $resource->{username}.'@'.$resource->{domain};
-            unless (Email::Valid->address($address)) {
-                $err = "username and domain combination is not valid.";
-            }
-        }
         if ($err) {
             $c->log->error($err);
             $self->field('username')->add_error($err);