diff --git a/include/enotify.php b/include/enotify.php
index b184a6935e..d8e5614c17 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -42,9 +42,9 @@ function notification($params)
 	}
 
 	$params['notify_flags'] = defaults($params, 'notify_flags', $user['notify-flags']);
-	$params['language'] = defaults($params, 'language', $user['language']);
-	$params['to_name'] = defaults($params, 'to_name', $user['username']);
-	$params['to_email'] = defaults($params, 'to_email', $user['email']);
+	$params['language']     = defaults($params, 'language'    , $user['language']);
+	$params['to_name']      = defaults($params, 'to_name'     , $user['username']);
+	$params['to_email']     = defaults($params, 'to_email'    , $user['email']);
 
 	// from here on everything is in the recipients language
 	L10n::pushLang($params['language']);
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 0472d753dd..f8fc1651c1 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -83,10 +83,11 @@ class DBStructure
 			$body = sprintf($body, $error_message);
 
 			notification([
-				'type' => SYSTEM_EMAIL,
+				'uid'      => $admin['uid'],
+				'type'     => SYSTEM_EMAIL,
 				'to_email' => $admin['email'],
 				'preamble' => $preamble,
-				'body' => $body,
+				'body'     => $body,
 				'language' => $lang]
 			);
 		}
diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 2c42643b44..23b97a5cd0 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -953,13 +953,13 @@ class Probe
 
 		$prof_data["addr"]         = $data["addr"];
 		$prof_data["nick"]         = $data["nick"];
-		$prof_data["dfrn-request"] = $data["request"];
-		$prof_data["dfrn-confirm"] = $data["confirm"];
-		$prof_data["dfrn-notify"]  = $data["notify"];
-		$prof_data["dfrn-poll"]    = $data["poll"];
-		$prof_data["photo"]        = $data["photo"];
-		$prof_data["fn"]           = $data["name"];
-		$prof_data["key"]          = $data["pubkey"];
+		$prof_data["dfrn-request"] = defaults($data, 'request', null);
+		$prof_data["dfrn-confirm"] = defaults($data, 'confirm', null);
+		$prof_data["dfrn-notify"]  = defaults($data, 'notify' , null);
+		$prof_data["dfrn-poll"]    = defaults($data, 'poll'   , null);
+		$prof_data["photo"]        = defaults($data, 'photo'  , null);
+		$prof_data["fn"]           = defaults($data, 'name'   , null);
+		$prof_data["key"]          = defaults($data, 'pubkey' , null);
 
 		logger("Result for profile ".$profile_link.": ".print_r($prof_data, true), LOGGER_DEBUG);