diff --git a/postfix/postfinger.cgi b/postfix/postfinger.cgi
index 34d111e66..d1fef4ecc 100755
--- a/postfix/postfinger.cgi
+++ b/postfix/postfinger.cgi
@@ -196,13 +196,13 @@ if ( !$in{'go'} ) {
 		open(MAILQ, "/bin/cat `$config{'postfix_config_command'} -h config_directory`/master.cf 2>/dev/null |");
 		while (my $postfinger = <MAILQ>) { 
 			($postf1,$postf2,$postf3,$postf4,$postf5,$postf6,$postf7,$postf8)=split(/\s+/,$postfinger,8);
-			if ( grep(/\-\o/,$postfinger)){
+			if ($postfinger =~ /\-\o/) {
 				print "<tr><td class='e'> </td><td class='v'> </td>",
 					"<td class='v'> </td><td class='v'> </td>",
 					"<td class='v'> </td><td class='v'> </td>",
 					"<td class='v'> </td><td class='v'>$postf2</td></tr>"
 				if ( !grep(/^#|^\[ 	\]*$/,$postfinger));
-			} elsif  ( grep(/user=/,$postfinger)){
+			} elsif ($postfinger =~ /user=/) {
 				print "<tr><td class='e'> </td><td class='v'> </td>",
 					"<td class='v'> </td><td class='v'> </td>",
 					"<td class='v'> </td><td class='v'> </td>",