diff --git a/interface/lib/plugins/mail_user_filter_plugin.inc.php b/interface/lib/plugins/mail_user_filter_plugin.inc.php
index 7715e3fda76e07d60df8502dc4e7d7dafcf893d8..3b6252412c98ac7cf0d8e3fb2c16bee198a071dd 100644
--- a/interface/lib/plugins/mail_user_filter_plugin.inc.php
+++ b/interface/lib/plugins/mail_user_filter_plugin.inc.php
@@ -169,7 +169,7 @@ if ( ".'$RETURNCODE'." != 1 )
 ";
 			}
 
-			$content .= "if (/^".$page_form->dataRecord["source"].":";
+			$content .= "if (/^".$page_form->dataRecord["source"].": ";
 
 			$searchterm = preg_quote($page_form->dataRecord["searchterm"]);
 
@@ -178,7 +178,7 @@ if ( ".'$RETURNCODE'." != 1 )
 			} elseif ($page_form->dataRecord["op"] == 'is') {
 				$content .= $searchterm."$/:h)\n";
 			} elseif ($page_form->dataRecord["op"] == 'begins') {
-				$content .= " ".$searchterm."/:h)\n";
+				$content .= $searchterm."/:h)\n";
 			} elseif ($page_form->dataRecord["op"] == 'ends') {
 				$content .= ".*".$searchterm."$/:h)\n";
 			}