diff --git a/mod/display.php b/mod/display.php
index e9d1bbbb14..af121abdb2 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -211,8 +211,11 @@ function display_content(&$a) {
 				}
 			}
 
-			$profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
-			$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
+			$diff_author = (($item['url'] !== $item['author-link']) ? true : false);
+
+			$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
+			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
+
 			$profile_link = $profile_url;
 
 			if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
diff --git a/mod/network.php b/mod/network.php
index fb4a359840..6e781f4fa3 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -239,10 +239,11 @@ function network_content(&$a, $update = 0) {
 
 			// Post was remotely authored.
 
-//			if((x($item,'author-link')) && ($item['url'] !== $item['author-link'])) { 
-				$profile_name   = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
-				$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $thumb);
-//			}
+			$diff_author = (($item['url'] !== $item['author-link']) ? true : false);
+
+			$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
+			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
+
 
 			$profile_link = $profile_url;