diff --git a/admin/index.php b/admin/index.php
index 559a1b7..3d6f9a5 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -38,6 +38,7 @@
 	 echo "  <td><a href=\"registration.php\">".theme_icon("participant_registration")."<br />".i18n("Participant Registration")."</a></td>";
 	 echo "  <td><a href=\"committees.php\">".theme_icon("committee_management")."<br />".i18n("Committee Management")."</a></td>";
 	 echo "  <td><a href=\"judges.php\">".theme_icon("judging_management")."<br />".i18n("Judging Management")."</a></td>";
+	 echo "  <td><a href=\"account_list.php\">".theme_icon("account_management")."<br />".i18n("Account Management")."</a></td>";
 	 echo "  <td>";
 	 if($config['volunteer_enable'] == 'yes')
 		echo "<a href=\"volunteers.php\">".theme_icon("volunteer_management")."<br />".i18n("Volunteer Management")."</a>";
diff --git a/admin/judges.php b/admin/judges.php
index 605bb96..0563b5e 100644
--- a/admin/judges.php
+++ b/admin/judges.php
@@ -33,7 +33,6 @@
 			);
  echo "<br />";
  echo '<b>'.i18n('Judges').'</b><ul>';
- echo "<li><a href=\"account_list.php\">".i18n("Account List")."</a></li></li>";
  echo "<li><a href=\"../user_invite.php?type=judge\">".i18n("Invite Judges")."</a></li></li>";
  echo "<li><a href=\"user_list.php?show_types[]=judge\">".i18n("Manage Judges")."</a> - ".i18n("Add, Delete, Edit, and List judges").'</li>';
  echo '</ul>';
diff --git a/user_main.php b/user_main.php
index c40bc38..4a78104 100644
--- a/user_main.php
+++ b/user_main.php
@@ -163,13 +163,15 @@ function draw_roles(){
 	$registered = array();
 	while($row = mysql_fetch_assoc($q)){
 		$roleid = $row['type'];
-		$idx = $roleid . "_registration_type";
-		if(array_key_exists($idx, $config)){
-			// this is a role that can potentially be registered for
-			if(is_array($u['roles']) && array_key_exists($row['type'], $u['roles'])){
-				$registered[$row['type']] = $row['name'];
-			}else{
-				$available[$row['type']] = $row['name'];
+		if($config[$roleid.'_enable']!="no") {
+			$idx = $roleid . "_registration_type";
+			if(array_key_exists($idx, $config)){
+				// this is a role that can potentially be registered for
+				if(is_array($u['roles']) && array_key_exists($row['type'], $u['roles'])){
+					$registered[$row['type']] = $row['name'];
+				}else{
+					$available[$row['type']] = $row['name'];
+				}
 			}
 		}
 	}