diff --git a/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelViewgroups.pm b/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelViewgroups.pm
index 018c101..8990faf 100644
--- a/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelViewgroups.pm
+++ b/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelViewgroups.pm
@@ -82,7 +82,10 @@ sub get_group_mail {
     my $domain = $db->get('DomainName')->value();
     my @mails = ("$group\@$domain");
     foreach ($accounts->pseudonyms()){
-        push @mails, $_->key . "\@$domain" if (($_->prop('Account') || '') eq $group);
+        next unless (($_->prop('Account') || '') eq $group);
+        my $mail = $_->key;
+        $mail .= "\@$domain" if ($mail !~ /\@/);
+        push @mails, $mail;
     }
     return join("<br>",@mails);
 }