diff --git a/mod/follow.php b/mod/follow.php
index f99d91757c..f8964885e1 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -22,6 +22,14 @@ function follow_init(&$a) {
 		// NOTREACHED
 	}
 
+
+	if(! $url) {
+		notice( t('Connect URL missing.') . EOL);
+		goaway($_SESSION['return_url']);
+		// NOTREACHED
+	}
+
+
 	$ret = probe_url($url);
 
 	if($ret['network'] === NETWORK_DFRN) {
diff --git a/mod/match.php b/mod/match.php
index 9324624c84..3645a419da 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -54,6 +54,7 @@ function match_content(&$a) {
 					'$url' => $jj->url,
 					'$name' => $jj->name,
 					'$photo' => $jj->photo,
+					'$inttxt' => ' ' . t('is interested in:'),
 					'$conntxt' => t('Connect'),
 					'$connlnk' => $connlnk,
 					'$tags' => $jj->tags
diff --git a/view/theme/testbubble/match.tpl b/view/theme/testbubble/match.tpl
index 49c3c81e4b..244b243ece 100644
--- a/view/theme/testbubble/match.tpl
+++ b/view/theme/testbubble/match.tpl
@@ -4,7 +4,10 @@
 			<img src="$photo" alt="$name" />
 		</a>
 	</div>
-	<span><a href="$url">$name</a> is interested in:<br />$tags</span>
+	<span><a href="$url">$name</a>$inttxt<br />$tags</span>
 	<div class="profile-match-break"></div>
+	{{ if $connlnk }}
+	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
+	{{ endif }}
 	<div class="profile-match-end"></div>
 </div>
\ No newline at end of file