diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 9a797c0e1d..df325baecf 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -52,7 +52,7 @@ function display_forums($root_data, $display_moderators=TRUE)
 			continue;
 		}
 
-		if (!$auth->acl_get('f_list', $row['forum_id']))
+		if (!$auth->acl_gets('f_list', 'm_', 'a_', $row['forum_id']))
 		{
 			// if the user does not have permissions to list this forum, skip everything until next branch
 
@@ -105,7 +105,7 @@ function display_forums($root_data, $display_moderators=TRUE)
 
 	if ($display_moderators)
 	{
-		$forum_moderators = get_moderators($forum_moderators, $forum_ids);
+		get_moderators($forum_moderators, $forum_ids);
 	}
 
 	$root_id = $root_data['forum_id'];
@@ -151,7 +151,7 @@ function display_forums($root_data, $display_moderators=TRUE)
 			$folder_image = 'forum_locked';
 			$folder_alt = 'Forum_locked';
 		}
-		else		
+		else
 		{
 			$folder_image = ($unread_topics) ? 'forum_new' : 'forum';
 			$folder_alt = ($unread_topics) ? 'New_posts' : 'No_new_posts';
@@ -170,17 +170,6 @@ function display_forums($root_data, $display_moderators=TRUE)
 			$last_post = $user->lang['No_Posts'];
 		}
 
-		if (!empty($forum_moderators[$forum_id]))
-		{
-			$l_moderator = (count($forum_moderators[$forum_id]) == 1) ? $user->lang['Moderator'] . ': ' : $user->lang['Moderators'] . ': ' ;
-			$moderators_list = implode(', ', $forum_moderators[$forum_id]);
-		}
-		else
-		{
-			$l_moderator = ' ';
-			$moderators_list = ' ';
-		}
-
 		if (isset($subforums[$forum_id]))
 		{
 			foreach ($subforums[$forum_id] as $subrow)
@@ -192,7 +181,7 @@ function display_forums($root_data, $display_moderators=TRUE)
 			$links = array();
 			foreach ($alist as $subforum_id => $subforum_name)
 			{
-				$links[] = '<a href="viewforum.' . $phpEx . $SID . '&f=' . $subforum_id . '">' . htmlspecialchars($subforum_name) . '</a>';
+				$links[] = '<a href="viewforum.' . $phpEx . $SID . '&amp;f=' . $subforum_id . '">' . htmlspecialchars($subforum_name) . '</a>';
 			}
 			$subforums_list = implode(', ', $links);
 
@@ -210,7 +199,7 @@ function display_forums($root_data, $display_moderators=TRUE)
 			if (!empty($forum_moderators[$forum_id]))
 			{
 				$l_moderator = (count($forum_moderators[$forum_id]) == 1) ? $user->lang['Moderator'] : $user->lang['Moderators'];
-				$moderators_list = implode(', ', $forum_moderators);
+				$moderators_list = implode(', ', $forum_moderators[$forum_id]);
 			}
 		}
 		else
diff --git a/phpBB/index.php b/phpBB/index.php
index a64363e10a..737bdaa647 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -83,8 +83,8 @@ else
 
 // Forum moderators ... a static template var could allow us
 // to drop these queries ...
-$forum_moderators = array();
-get_moderators($forum_moderators);
+//$forum_moderators = array();
+//get_moderators($forum_moderators);
 
 // Set some vars
 $root_id = $branch_root_id = $cat_id;