diff --git a/classes/class_torrent_form.php b/classes/class_torrent_form.php
index c96e7591..3cf4bdc5 100644
--- a/classes/class_torrent_form.php
+++ b/classes/class_torrent_form.php
@@ -625,12 +625,6 @@ function show() {
 					<p class="min_padding">Contains background information such as album history and maybe a review.</p> 
 				</td>
 			</tr>
-			<tr>
-				<td class="label" style="font-weight: bold;">Library Contest Image Location</td>
-				<td>
-					<input type="text" id="library_image" name="library_image" size="60" />&nbsp;&nbsp;<input type="checkbox" id="multi_disc" name="multi_disc" />Multi-disc Upload
-				</td>
-			</tr>
 <?		} // if new torrent ?> 
 			<tr>
 				<td class="label">Release Description (optional)</td>
diff --git a/classes/script_start.php b/classes/script_start.php
index 903ad36a..4c4da687 100644
--- a/classes/script_start.php
+++ b/classes/script_start.php
@@ -267,7 +267,7 @@ function user_info($UserID) {
 	global $DB, $Cache, $Classes;
 	$UserInfo = $Cache->get_value('user_info_'.$UserID);
 	// the !isset($UserInfo['Paranoia']) can be removed after a transition period
-	if(empty($UserInfo) || empty($UserInfo['ID']) || !isset($UserInfo['Paranoia'])) {
+	if(empty($UserInfo) || empty($UserInfo['ID']) || !isset($UserInfo['Paranoia']) || empty($UserInfo['Class'])) {
 		$OldQueryID = $DB->get_query_id();
 
 
@@ -301,6 +301,8 @@ function user_info($UserID) {
 			}
 		}
 		
+		$UserInfo['Class'] = $Classes[$UserInfo['PermissionID']]['Level'];
+		
 		if (!empty($UserInfo['Levels'])) {
 			$UserInfo['ExtraClasses'] = array_fill_keys(explode(',', $UserInfo['Levels']), 1);
 		} else {
diff --git a/design/privateheader.php b/design/privateheader.php
index 2a8d2443..a847e84d 100644
--- a/design/privateheader.php
+++ b/design/privateheader.php
@@ -137,7 +137,7 @@
                         JOIN forums_last_read_topics AS l ON s.UserID = l.UserID AND s.TopicID = l.TopicID
                         JOIN forums_topics AS t ON l.TopicID = t.ID
                         JOIN forums AS f ON t.ForumID = f.ID
-                WHERE (f.MinClassRead <= ".$LoggedUser['EffectiveClass']." OR f.ID IN ('$PermittedForums'))
+                WHERE (f.MinClassRead <= ".$LoggedUser['Class']." OR f.ID IN ('$PermittedForums'))
                         AND l.PostID < t.LastPostID
                         AND s.UserID = ".$LoggedUser['ID'].
                 (!empty($RestrictedForums) ? "
diff --git a/sections/requests/request.php b/sections/requests/request.php
index 594d8ba9..3da88901 100644
--- a/sections/requests/request.php
+++ b/sections/requests/request.php
@@ -352,6 +352,7 @@
 						<input type="hidden" id="amount" name="amount" value="0">
 						<input type="hidden" id="current_uploaded" value="<?=$LoggedUser['BytesUploaded']?>" />
 						<input type="hidden" id="current_downloaded" value="<?=$LoggedUser['BytesDownloaded']?>" />
+						<input type="hidden" id="current_rr" value="<?=(float)$LoggedUser['RequiredRatio']?>" />
 						<input id="total_bounty" type="hidden" value="<?=$RequestVotes['TotalBounty']?>" />
 						If you add the entered <strong><span id="new_bounty">0.00 MB</span></strong> of bounty, your new stats will be: <br/>
 						Uploaded: <span id="new_uploaded"><?=get_size($LoggedUser['BytesUploaded'])?></span>
diff --git a/static/functions/requests.js b/static/functions/requests.js
index ec7d1826..6e06f85f 100644
--- a/static/functions/requests.js
+++ b/static/functions/requests.js
@@ -19,6 +19,17 @@ function Vote(amount, requestid) {
 		index = true;
 	}
 	
+	if (amount > 20*1024*1024) {
+		upload   = $('#current_uploaded').raw().value;
+		download = $('#current_downloaded').raw().value;
+		rr       = $('#current_rr').raw().value;
+		if (amount > .3*(upload - rr * download)) {
+			if(!confirm('This vote is more than 30% of your buffer.  Please confirm that you wish to place this large a vote.')) {
+				return false;
+			}
+		}
+	}
+	
 	ajax.get('requests.php?action=takevote&id=' + requestid + '&auth=' + $('#auth').raw().value + '&amount=' + amount, function (response) {
 			if(response == 'bankrupt') {
 				error_message("You do not have sufficient upload credit to add " + get_size(amount) + " to this request");