diff --git a/sections/artist/artist.php b/sections/artist/artist.php
index 85814da6..894cae4a 100644
--- a/sections/artist/artist.php
+++ b/sections/artist/artist.php
@@ -176,9 +176,14 @@ function compare($X, $Y){
 				$DisplayName = $ReleaseTypes[$ReleaseID]."s";
 				break;
 		}
-
+		
+		if (!empty($LoggedUser['DiscogView']) || (isset($LoggedUser['HideTypes']) && in_array($ReleaseID, $LoggedUser['HideTypes']))) {
+			$ToggleStr = " onClick=\"$('.releases_$ReleaseID').show(); return true;\"";
+		} else {
+			$ToggleStr = '';
+		}
 ?>
-		<a href="#torrents_<?=str_replace(" ", "_", strtolower($ReleaseTypes[$ReleaseID]))?>">[<?=$DisplayName?>]</a>
+		<a href="#torrents_<?=str_replace(" ", "_", strtolower($ReleaseTypes[$ReleaseID]))?>"<?=$ToggleStr?>>[<?=$DisplayName?>]</a>
 <?
 	}
 	if ($NumRequests > 0) {
diff --git a/sections/user/takemoderate.php b/sections/user/takemoderate.php
index a8f045a1..df7d2b83 100644
--- a/sections/user/takemoderate.php
+++ b/sections/user/takemoderate.php
@@ -323,7 +323,7 @@
 }
 
 if ($Warned == 1 && $Cur['Warned']=='0000-00-00 00:00:00' && check_perms('users_warn')) {
-	send_pm($UserID,0,db_string('You have received a warning'),db_string("You have been [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&id=218]warned for $WarnLength week(s)[/url] by $LoggedUser[Username]. The reason given was: $WarnReason"));
+	send_pm($UserID,0,db_string('You have received a warning'),db_string("You have been [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&id=218]warned for $WarnLength week(s)[/url] by [user]".$LoggedUser['Username']."[/user]. The reason given was: $WarnReason"));
 	$UpdateSet[]="Warned='".sqltime()."' + INTERVAL $WarnLength WEEK";
 	$Msg = "warned for $WarnLength week(s)";
 	if ($WarnReason) { $Msg.=" for $WarnReason"; }
@@ -337,7 +337,7 @@
 
 } elseif ($Warned == 1 && $ExtendWarning!='---' && check_perms('users_warn')) {
 	
-	send_pm($UserID,0,db_string('Your warning has been extended'),db_string("Your warning has been extended by $ExtendWarning week(s) by $LoggedUser[Username]. The reason given was: $WarnReason"));
+	send_pm($UserID,0,db_string('Your warning has been extended'),db_string("Your warning has been extended by $ExtendWarning week(s) by [user]".$LoggedUser['Username']."[/user]. The reason given was: $WarnReason"));
 	
 	$UpdateSet[]="Warned=Warned + INTERVAL $ExtendWarning WEEK";
 	$Msg = "warning extended by $ExtendWarning week(s)";