diff --git a/viewtopic.php b/viewtopic.php
index 612fe484..387d9edf 100644
--- a/viewtopic.php
+++ b/viewtopic.php
@@ -793,12 +793,12 @@ for($i = 0; $i < $total_posts; $i++)
 		'POSTER_JOINED'      => ($bb_cfg['show_poster_joined']) ? $poster_longevity : '',
 
 		'POSTER_JOINED_DATE' => $poster_joined,
-		'POSTER_POSTS'       => ($bb_cfg['show_poster_posts']) ? '<a href="search.php?search_author=1&amp;uid='.$poster_id.'" target="_blank">'. $poster_posts .'</a>' : '',
-		'POSTER_FROM'        => ($bb_cfg['show_poster_from']) ? wbr($poster_from) : '',
+		'POSTER_POSTS'       => ($poster_posts && $bb_cfg['show_poster_posts']) ? '<a href="search.php?search_author=1&amp;uid='.$poster_id.'" target="_blank">'. $poster_posts .'</a>' : '',
+		'POSTER_FROM'        => ($poster_from && $bb_cfg['show_poster_from']) ? wbr($poster_from) : '',
 		'POSTER_BOT'         => ($poster_id == BOT_UID),
 		'POSTER_ID'          => $poster_id,
 		'POSTER_AUTHOR'      => ($poster_id == $t_data['topic_poster']),
-		'POSTER_GENDER'      => ($bb_cfg['gender']) ? gender_image($postrow[$i]['user_gender']) : '',
+		'POSTER_GENDER'      => (($poster_id != GUEST_UID) && $bb_cfg['gender']) ? gender_image($postrow[$i]['user_gender']) : '',
 		'POSTED_AFTER'       => ($prev_post_time) ? delta_time($postrow[$i]['post_time'], $prev_post_time) : '',
 		'IS_UNREAD'          => is_unread($postrow[$i]['post_time'], $topic_id, $forum_id),
 		'IS_FIRST_POST'      => (!$start && ($post_id == $t_data['topic_first_post_id'])),