diff --git a/mod/follow.php b/mod/follow.php
index a90ae3f512..62ba2585c2 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -10,7 +10,9 @@ function follow_post(&$a) {
 		// NOTREACHED
 	}
 
-	$url = notags(trim($_POST['url']));
+	$url = $orig_url = notags(trim($_POST['url']));
+	
+	$email_conversant = false;
 
 	if($url) {
 		$links = lrdd($url);
@@ -29,6 +31,11 @@ function follow_post(&$a) {
 
 			}
 		}
+		else {
+			if((strpos($orig_url,'@')) && validate_email($orig_url)) {
+				$email_conversant = true;
+			}
+		}
 	}	
 
 	// If we find a DFRN site, send our subscriber to the other person's