diff --git a/classes/script_start.php b/classes/script_start.php
index 91af630d..737f1fd3 100644
--- a/classes/script_start.php
+++ b/classes/script_start.php
@@ -1639,7 +1639,7 @@ function display_artists($Artists, $MakeLink = true, $IncludeHyphen = true, $Esc
 		$Conductors  = $Artists[5];
 		$DJs         = $Artists[6];
 		
-		if (count($MainArtists) + (count($Composers)<3?count($Composers):0) + count($Conductors) + count($DJs) == 0) {
+		if ((count($MainArtists) + count($Conductors) + count($DJs) == 0) && (count($Composers) == 0)) {
 			return '';
 		}
 		
@@ -1703,6 +1703,8 @@ function display_artists($Artists, $MakeLink = true, $IncludeHyphen = true, $Esc
 		
 		if ((count($Composers) > 0) && (count($MainArtists) + count($Conductors) > 3) && (count($MainArtists) > 1) && (count($Conductors) > 1)) {
 			$link = $ComposerStr . 'Various Artists';
+		} elseif ((count($Composers) > 2) && (count($MainArtists) + count($Conductors) == 0)) {
+			$link = 'Various Composers';
 		}
 				
 		// DJs override everything else
diff --git a/sections/user/user.php b/sections/user/user.php
index 6585ac07..111fce4d 100644
--- a/sections/user/user.php
+++ b/sections/user/user.php
@@ -255,7 +255,7 @@ function check_paranoia_here($Setting) {
 	$ArtistsAdded = 0;
 }
 
-/*include(SERVER_ROOT.'/classes/class_user_rank.php');
+include(SERVER_ROOT.'/classes/class_user_rank.php');
 $Rank = new USER_RANK;
 
 $UploadedRank = $Rank->get_rank('uploaded', $Uploaded);
@@ -264,7 +264,7 @@ function check_paranoia_here($Setting) {
 $RequestRank = $Rank->get_rank('requests', $RequestsFilled);
 $PostRank = $Rank->get_rank('posts', $ForumPosts);
 $BountyRank = $Rank->get_rank('bounty', $TotalSpent);
-$ArtistsRank = $Rank->get_rank('artists', $ArtistsAdded);*/
+$ArtistsRank = $Rank->get_rank('artists', $ArtistsAdded);
 
 if($Downloaded == 0) {
 	$Ratio = 1;
@@ -273,7 +273,7 @@ function check_paranoia_here($Setting) {
 } else {
 	$Ratio = round($Uploaded/$Downloaded, 2);
 }
-/*$OverallRank = $Rank->overall_score($UploadedRank, $DownloadedRank, $UploadsRank, $RequestRank, $PostRank, $BountyRank, $ArtistsRank, $Ratio);*/
+$OverallRank = $Rank->overall_score($UploadedRank, $DownloadedRank, $UploadsRank, $RequestRank, $PostRank, $BountyRank, $ArtistsRank, $Ratio);
 
 ?>
 		<div class="box">