diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index 58bb11670..2cede5685 100644
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
@@ -13,7 +13,7 @@ use Friendica\Util\Strings;
 
 function fsuggest_post(App $a)
 {
-	if (! local_user()) {
+	if (!local_user()) {
 		return;
 	}
 
@@ -22,53 +22,38 @@ function fsuggest_post(App $a)
 	}
 
 	$contact_id = intval($a->argv[1]);
+	if (empty($contact_id)) {
+		return;
+	}
 
-	$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]);
-	if (! DBA::isResult($contact)) {
+	// We do query the "uid" as well to ensure that it is our contact
+	if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) {
 		notice(L10n::t('Contact not found.') . EOL);
 		return;
 	}
 
-	$new_contact = intval($_POST['suggest']);
+	$suggest_contact_id = intval($_POST['suggest']);
+	if (empty($suggest_contact_id)) {
+		return;
+	}
 
-	$hash = Strings::getRandomHex();
+	// We do query the "uid" as well to ensure that it is our contact
+	$contact = DBA::selectFirst('contact', ['name', 'url', 'request', 'avatar'], ['id' => $suggest_contact_id, 'uid' => local_user()]);
+	if (!DBA::isResult($contact)) {
+		notice(L10n::t('Suggested contact not found.') . EOL);
+		return;
+	}
 
 	$note = Strings::escapeHtml(trim(defaults($_POST, 'note', '')));
 
-	if ($new_contact) {
-		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($new_contact),
-			intval(local_user())
-		);
-		if (DBA::isResult($r)) {
-			q("INSERT INTO `fsuggest` ( `uid`,`cid`,`name`,`url`,`request`,`photo`,`note`,`created`)
-				VALUES ( %d, %d, '%s','%s','%s','%s','%s','%s')",
-				intval(local_user()),
-				intval($contact_id),
-				DBA::escape($contact['name']),
-				DBA::escape($contact['url']),
-				DBA::escape($contact['request']),
-				DBA::escape($contact['photo']),
-				DBA::escape($hash),
-				DBA::escape(DateTimeFormat::utcNow())
-			);
-			$r = q("SELECT `id` FROM `fsuggest` WHERE `note` = '%s' AND `uid` = %d LIMIT 1",
-				DBA::escape($hash),
-				intval(local_user())
-			);
-			if (DBA::isResult($r)) {
-				$fsuggest_id = $contact['id'];
-				q("UPDATE `fsuggest` SET `note` = '%s' WHERE `id` = %d AND `uid` = %d",
-					DBA::escape($note),
-					intval($fsuggest_id),
-					intval(local_user())
-				);
-				Worker::add(PRIORITY_HIGH, 'Notifier', 'suggest', $fsuggest_id);
-			}
+	$fields = ['uid' => local_user(),'cid' => $contact_id, 'name' => $contact['name'],
+		'url' => $contact['url'], 'request' => $contact['request'],
+		'photo' => $contact['avatar'], 'note' => $note, 'created' => DateTimeFormat::utcNow()];
+	DBA::insert('fsuggest', $fields);
 
-			info(L10n::t('Friend suggestion sent.') . EOL);
-		}
-	}
+	Worker::add(PRIORITY_HIGH, 'Notifier', 'suggest', DBA::lastInsertId());
+
+	info(L10n::t('Friend suggestion sent.') . EOL);
 }
 
 function fsuggest_content(App $a)
diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 921662a11..904e9904e 100644
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -319,7 +319,7 @@ class Delivery extends BaseObject
 			$deliver_status = DFRN::deliver($owner, $contact, $atom, false, true);
 		}
 
-		Logger::log('Delivery to ' . $contact['url'] . ' with guid ' . defaults($target_item, 'guid', $target_item['id']) . ' returns ' . $deliver_status);
+		Logger::info('DFRN Delivery', ['cmd' => $cmd, 'url' => $contact['url'], 'guid' => defaults($target_item, 'guid', $target_item['id']), 'return' => $deliver_status]);
 
 		if ($deliver_status < 0) {
 			Logger::info('Delivery failed: defer message', ['id' => defaults($target_item, 'guid', $target_item['id'])]);