diff --git a/include/conversation.php b/include/conversation.php
index 9e813b5eb0..2ccdf8fb72 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -354,7 +354,7 @@ function localize_item(&$item)
 		'network' => $item['author-network'], 'url' => $item['author-link']];
 
 	// Only create a redirection to a magic link when logged in
-	if (!empty($item['plink']) && local_user()) {
+	if (!empty($item['plink']) && (local_user() || remote_user())) {
 		$item['plink'] = Contact::magicLinkbyContact($author, $item['plink']);
 	}
 }
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 1524678638..70428ab840 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -210,7 +210,7 @@ class Post extends BaseObject
 		$author = ['uid' => 0, 'id' => $item['author-id'],
 			'network' => $item['author-network'], 'url' => $item['author-link']];
 
-		if (local_user()) {
+		if (local_user() || remote_user()) {
 			$profile_link = Contact::magicLinkbyContact($author);
 		} else {
 			$profile_link = $item['author-link'];