diff --git a/lib/WebGUI/Workflow/Activity/GetCsMail.pm b/lib/WebGUI/Workflow/Activity/GetCsMail.pm
index 15bb038d4..e6d48f123 100644
--- a/lib/WebGUI/Workflow/Activity/GetCsMail.pm
+++ b/lib/WebGUI/Workflow/Activity/GetCsMail.pm
@@ -180,8 +180,10 @@ sub execute {
 	while (my $message = $mail->getNextMessage) {
 		next unless (scalar(@{$message->{parts}})); # no content, skip it
 		my $from = $message->{from};
-		$from =~ s/<(\S+\@\S+)>/$1/;
-		my $user = WebGUI::User->newByEmail($self->session, $from); #instantiate the user by email
+        if ($from =~ /<(\S+\@\S+)>/) {
+            $from = $1;
+        }
+        my $user = WebGUI::User->newByEmail($self->session, $from); #instantiate the user by email
 		
 		unless (defined $user) { #if no user
 			unless ($postGroup eq 1 || $postGroup eq 7) { #reject mail if no registered email, unless post group is Visitors (1) or Everyone (7)