3 files changed, 6 insertions, 2 deletions
diff --git a/Bug.pm b/Bug.pm
index 35f8402ef..dd91d6f3f 100755
--- a/Bug.pm
+++ b/Bug.pm
@@ -362,6 +362,8 @@ sub user {
     $self->{'user'} = {};
 
     my $movers = Param("movers");
+    $movers =~ s/\s?,\s?/|/g;
+    $movers =~ s/@/\@/g;
     $self->{'user'}->{'canmove'} = Param("move-enabled") 
       && (defined $::COOKIE{"Bugzilla_login"}) 
         && ($::COOKIE{"Bugzilla_login"} =~ /$movers/);
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 35f8402ef..dd91d6f3f 100755
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -362,6 +362,8 @@ sub user {
     $self->{'user'} = {};
 
     my $movers = Param("movers");
+    $movers =~ s/\s?,\s?/|/g;
+    $movers =~ s/@/\@/g;
     $self->{'user'}->{'canmove'} = Param("move-enabled") 
       && (defined $::COOKIE{"Bugzilla_login"}) 
         && ($::COOKIE{"Bugzilla_login"} =~ /$movers/);
diff --git a/move.pl b/move.pl
index 4807bf6d9..7d3d84553 100755
--- a/move.pl
+++ b/move.pl
@@ -86,7 +86,7 @@ if ( !defined $::FORM{'buglist'} ) {
 
 my $exporter = $::COOKIE{"Bugzilla_login"};
 my $movers = Param("movers");
-$movers =~ s/\w?,\w?/|/g;
+$movers =~ s/\s?,\s?/|/g;
 $movers =~ s/@/\@/g;
 unless ($exporter =~ /($movers)/) {
   print "Content-type: text/html\n\n";
@@ -149,7 +149,7 @@ $from =~ s/@/\@/;
 $msg .= "From: Bugzilla <" . $from . ">\n";
 $msg .= "Subject: Moving bug(s) $buglist\n\n";
 
-$template->process("bug/show.xml.tmpl", { bugs => \@bugs }, \$msg)
+$template->process("bug/show.xml.tmpl", { user => { login => $exporter }, bugs => \@bugs }, \$msg)
   || ThrowTemplateError($template->error());
 
 $msg .= "\n";