diff --git a/inc/subscription.php b/inc/subscription.php
index 8e3a99a8f558cc601f57eb261e89dc5690f94be3..669d6137ddf2fd05788a115e0d007828a72d0390 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -278,8 +278,8 @@ function subscription_addresslist(&$data){
     }
     $pres = array('style' => 'every', 'escaped' => true);
     if (!$self && isset($_SERVER['REMOTE_USER'])) {
-        $pres['user'] = '((?:(?!' . preg_quote_cb($_SERVER['REMOTE_USER']) .
-                        ')\S?)+)';
+        $pres['user'] = '((?!' . preg_quote_cb($_SERVER['REMOTE_USER']) .
+                        '\b)\S+)';
     }
     $subs = subscription_find($id, $pres);
     $emails = array();