diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index fb4c4f66dd..9e11619a11 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -184,6 +184,7 @@ class Probe {
 	public static function lrdd($uri) {
 
 		$lrdd = self::xrd($uri);
+		$webfinger = null;
 
 		if (!$lrdd) {
 			$parts = @parse_url($uri);
@@ -333,7 +334,7 @@ class Probe {
 			/// The biggest problem is the avatar picture that could have a reduced image size.
 			/// It should only be updated if the existing picture isn't existing anymore.
 			if (($data['network'] != NETWORK_FEED)
-				AND ($mode == PROBE_NORMAL)
+				AND ($data["network"] != NETWORK_DIASPORA)
 				AND $data["name"]
 				AND $data["nick"]
 				AND $data["url"]
@@ -402,8 +403,8 @@ class Probe {
 
 		} elseif (strstr($uri, '@')) {
 			// If the URI starts with "mailto:" then jump directly to the mail detection
-			if (strpos($url, 'mailto:') !== false) {
-				$uri = str_replace('mailto:', '', $url);
+			if (strpos($uri, 'mailto:') !== false) {
+				$uri = str_replace('mailto:', '', $uri);
 				return self::mail($uri, $uid);
 			}