diff --git a/e107_plugins/forum/forum_class.php b/e107_plugins/forum/forum_class.php
index a9924a42f..027380a9f 100644
--- a/e107_plugins/forum/forum_class.php
+++ b/e107_plugins/forum/forum_class.php
@@ -1247,7 +1247,7 @@ class e107forum
 			{
 				foreach ($postCount as $k => $v)
 				{
-					$e107->sql->db_Update('user_extended', 'user_plugin_forum_posts=GREATEST(user_plugin_forum_posts-'.$v.',0) WHERE user_id='.$k);
+					$e107->sql->db_Update('user_extended', 'user_plugin_forum_posts=GREATEST(user_plugin_forum_posts-'.$v.',0) WHERE user_extended_id='.$k);
 				}
 			}
 
@@ -1308,7 +1308,7 @@ class e107forum
 			//decrement user post counts
 			if ($row['post_user'])
 			{
-				$e107->sql->db_Update('user_extended', 'user_plugin_forum_posts=GREATEST(user_plugin_forum_posts-1,0) WHERE user_id='.$row['post_user']);
+				$e107->sql->db_Update('user_extended', 'user_plugin_forum_posts=GREATEST(user_plugin_forum_posts-1,0) WHERE user_extended_id='.$row['post_user']);
 			}
 
 			// update thread with correct reply counts
diff --git a/e107_plugins/forum/forum_viewtopic.php b/e107_plugins/forum/forum_viewtopic.php
index d5b881462..84f1b1aab 100644
--- a/e107_plugins/forum/forum_viewtopic.php
+++ b/e107_plugins/forum/forum_viewtopic.php
@@ -224,14 +224,16 @@ foreach ($postList as $postInfo)
 		$postInfo['post_options'] = unserialize($postInfo['post_options']);
 	}
 	$loop_uid = (int)$postInfo['post_user'];
+	$tnum = $i;
 	$i++;
 
 	//TODO: Look into fixing this, to limit to a single query per pageload
+	$threadId = $thread->threadInfo['thread_id'];
 	$e_hide_query = "SELECT post_id FROM `#forum_post` WHERE (`post_thread` = {$threadId} AND post_user= " . USERID . ' LIMIT 1';
 	$e_hide_hidden = FORLAN_HIDDEN;
 	$e_hide_allowed = USER;
 
-	if ($i > 1)
+	if ($tnum > 1)
 	{
 		$postInfo['thread_start'] = false;
 		$alt = !$alt;