X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fsvc_acct.pm;h=28ef949860e488c6b73a8e38c8f301bd7b248a3c;hp=ddd6aa9da30148eef87c3c216b234d4c42d73a66;hb=6217d43dfc7345ec7f89be7fb90211fea458efde;hpb=f4c5c0a244d4cb9ee80f72e909b090b3e71eea2d

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index ddd6aa9da..28ef94986 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -237,7 +237,7 @@ sub insert {
     $self->svcpart($cust_svc->svcpart);
   }
 
-  my $error = $self->_check_duplicate;
+  $error = $self->_check_duplicate;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
@@ -863,12 +863,12 @@ sub _check_duplicate {
 
   my $global_unique = $conf->config('global_unique-username');
 
-  my @dup_user = grep { $svcpart != $_->svcpart }
+  my @dup_user = grep { !$self->svcnum || $_->svcnum != $self->svcnum }
                  qsearch( 'svc_acct', { 'username' => $self->username } );
   return gettext('username_in_use')
     if $global_unique eq 'username' && @dup_user;
 
-  my @dup_userdomain = grep { $svcpart != $_->svcpart }
+  my @dup_userdomain = grep { !$self->svcnum || $_->svcnum != $self->svcnum }
                        qsearch( 'svc_acct', { 'username' => $self->username,
                                               'domsvc'   => $self->domsvc } );
   return gettext('username_in_use')