diff --git a/twitter/twitter.php b/twitter/twitter.php
index f743d96ce..606d9c58d 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -465,9 +465,9 @@ function twitter_probe_detect(App $a, array &$hookData)
 		return;
 	}
 
-	if (preg_match('=(.*)@twitter.com=i', $hookData['uri'], $matches)) {
+	if (preg_match('=([^@]+)@(?:mobile\.)?twitter\.com$=i', $hookData['uri'], $matches)) {
 		$nick = $matches[1];
-	} elseif (preg_match('=https?://(?:mobile\.)?twitter.com/(.*)=i', $hookData['uri'], $matches)) {
+	} elseif (preg_match('=^https?://(?:mobile\.)?twitter\.com/(.+)=i', $hookData['uri'], $matches)) {
 		$nick = $matches[1];
 	} else {
 		return;