diff --git a/phpBB/admin/admin_ranks.php b/phpBB/admin/admin_ranks.php
index bbf064e2ab..874a8f45aa 100644
--- a/phpBB/admin/admin_ranks.php
+++ b/phpBB/admin/admin_ranks.php
@@ -106,8 +106,7 @@ if( $mode != "" )
 			"RANK" => $rank_info['rank_title'],
 			"SPECIAL_RANK" => $rank_is_special,
 			"NOT_SPECIAL_RANK" => $rank_is_not_special,
-			"MINIMUM" => $rank_info['rank_min'],
-			"MAXIMUM" => $rank_info['rank_max'],
+			"MINIMUM" => ( $rank_is_special ) ? "" : $rank_info['rank_min'],
 			"IMAGE" => ( $rank_info['rank_image'] != "" ) ? $rank_info['rank_image'] : "",
 			"IMAGE_DISPLAY" => ( $rank_info['rank_image'] != "" ) ? '<img src="' . $rank_info['rank_image'] . '" />' : "",
 			
@@ -116,7 +115,6 @@ if( $mode != "" )
 			"L_RANK_TITLE" => $lang['Rank_title'],
 			"L_RANK_SPECIAL" => $lang['Rank_special'],
 			"L_RANK_MINIMUM" => $lang['Rank_minimum'],
-			"L_RANK_MAXIMUM" => $lang['Rank_maximum'],
 			"L_RANK_IMAGE" => $lang['Rank_image'],
 			"L_RANK_IMAGE_EXPLAIN" => $lang['Rank_image_explain'],
 			"L_SUBMIT" => $lang['Submit'],
@@ -136,15 +134,14 @@ if( $mode != "" )
 		//
 		
 		$rank_id = ( isset($HTTP_POST_VARS['id']) ) ? intval($HTTP_POST_VARS['id']) : 0;
-		$rank_title = ( isset($HTTP_POST_VARS['title']) ) ? $HTTP_POST_VARS['title'] : "";
+		$rank_title = ( isset($HTTP_POST_VARS['title']) ) ? trim($HTTP_POST_VARS['title']) : "";
 		$special_rank = ( $HTTP_POST_VARS['special_rank'] == 1 ) ? TRUE : 0;
-		$max_posts = ( isset($HTTP_POST_VARS['max_posts']) ) ? intval($HTTP_POST_VARS['max_posts']) : -1;
 		$min_posts = ( isset($HTTP_POST_VARS['min_posts']) ) ? intval($HTTP_POST_VARS['min_posts']) : -1;
-		$rank_image = ( (isset($HTTP_POST_VARS['rank_image'])) ) ? $HTTP_POST_VARS['rank_image'] : "";
+		$rank_image = ( (isset($HTTP_POST_VARS['rank_image'])) ) ? trim($HTTP_POST_VARS['rank_image']) : "";
 
 		if( $rank_title == "" )
 		{
-			message_die(GENERAML_MESSAGE, $lang['Must_select_rank']);
+			message_die(GENERAL_MESSAGE, $lang['Must_select_rank']);
 		}
 
 		if( $special_rank == 1 )
@@ -167,22 +164,15 @@ if( $mode != "" )
 		if( $rank_id )
 		{
 			$sql = "UPDATE " . RANKS_TABLE . "
-				SET 
-					rank_title = '$rank_title', 
-					rank_special = '$special_rank',
-					rank_max = '$max_posts',
-					rank_min = '$min_posts',
-					rank_image = '$rank_image'
+				SET rank_title = '$rank_title', rank_special = $special_rank, rank_max = 0, rank_min = $min_posts, rank_image = '$rank_image'
 				WHERE rank_id = $rank_id";
 
 			$message = $lang['Rank_updated'];
 		}
 		else
 		{
-			$sql = "INSERT INTO " . RANKS_TABLE . "
-					(rank_title, rank_special, rank_max, rank_min, rank_image)
-				VALUES
-					('$rank_title', '$special_rank', '$max_posts', '$min_posts', '$rank_image')";
+			$sql = "INSERT INTO " . RANKS_TABLE . " (rank_title, rank_special, rank_max, rank_min, rank_image)
+				VALUES ('$rank_title', $special_rank, 0, $min_posts, '$rank_image')";
 
 			$message = $lang['Rank_added'];
 		}
@@ -222,7 +212,7 @@ if( $mode != "" )
 				message_die(GENERAL_ERROR, "Couldn't delete rank data", "", __LINE__, __FILE__, $sql);
 			}
 
-			$message .= "<br /><br />" . sprintf($lang['Click_return_rankadmin'], "<a href=\"" . append_sid("admin_ranks.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
+			$message = $lang['Rank_removed'] . "<br /><br />" . sprintf($lang['Click_return_rankadmin'], "<a href=\"" . append_sid("admin_ranks.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
 
 			message_die(GENERAL_MESSAGE, $message);
 
@@ -243,7 +233,7 @@ if( $mode != "" )
 		);
 		
 		$sql = "SELECT * FROM " . RANKS_TABLE . "
-			ORDER BY rank_min ASC, rank_special ASC";
+			ORDER BY rank_min, rank_title";
 		if( !$result = $db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, "Couldn't obtain ranks data", "", __LINE__, __FILE__, $sql);
@@ -257,7 +247,6 @@ if( $mode != "" )
 			"L_RANKS_TEXT" => $lang['Ranks_explain'],
 			"L_RANK" => $lang['Rank'],
 			"L_RANK_MINIMUM" => $lang['Rank_minimum'],
-			"L_RANK_MAXIMUM" => $lang['Rank_maximum'],
 			"L_SPECIAL_RANK" => $lang['Special_rank'],
 			"L_EDIT" => $lang['Edit'],
 			"L_DELETE" => $lang['Delete'],
@@ -273,7 +262,6 @@ if( $mode != "" )
 			$special_rank = $rank_rows[$i]['rank_special'];
 			$rank_id = $rank_rows[$i]['rank_id'];
 			$rank_min = $rank_rows[$i]['rank_min'];
-			$rank_max = $rank_rows[$i]['rank_max'];
 
 			if($special_rank)
 			{
@@ -288,7 +276,6 @@ if( $mode != "" )
 				"ROW_CLASS" => $row_class,
 				"RANK" => $rank,
 				"RANK_MIN" => $rank_min,
-				"RANK_MAX" => $rank_max,
 
 				"SPECIAL_RANK" => ( $special_rank == 1 ) ? $lang['Yes'] : $lang['No'],
 
@@ -322,7 +309,6 @@ else
 		"L_RANKS_TEXT" => $lang['Ranks_explain'],
 		"L_RANK" => $lang['Rank_title'],
 		"L_RANK_MINIMUM" => $lang['Rank_minimum'],
-		"L_RANK_MAXIMUM" => $lang['Rank_maximum'],
 		"L_SPECIAL_RANK" => $lang['Rank_special'],
 		"L_EDIT" => $lang['Edit'],
 		"L_DELETE" => $lang['Delete'],
@@ -338,9 +324,8 @@ else
 		$special_rank = $rank_rows[$i]['rank_special'];
 		$rank_id = $rank_rows[$i]['rank_id'];
 		$rank_min = $rank_rows[$i]['rank_min'];
-		$rank_max = $rank_rows[$i]['rank_max'];
 		
-		if($special_rank == "1")
+		if( $special_rank == 1 )
 		{
 			$rank_min = $rank_max = "-";
 		}
@@ -356,7 +341,6 @@ else
 			"RANK" => $rank,
 			"SPECIAL_RANK" => $rank_is_special,
 			"RANK_MIN" => $rank_min,
-			"RANK_MAX" => $rank_max,
 
 			"U_RANK_EDIT" => append_sid("admin_ranks.$phpEx?mode=edit&amp;id=$rank_id"),
 			"U_RANK_DELETE" => append_sid("admin_ranks.$phpEx?mode=delete&amp;id=$rank_id"))
diff --git a/phpBB/templates/subSilver/admin/ranks_edit_body.tpl b/phpBB/templates/subSilver/admin/ranks_edit_body.tpl
index af1d056fbe..cb0a528608 100644
--- a/phpBB/templates/subSilver/admin/ranks_edit_body.tpl
+++ b/phpBB/templates/subSilver/admin/ranks_edit_body.tpl
@@ -19,10 +19,6 @@
 		<td class="row1" width="38%"><span class="gen">{L_RANK_MINIMUM}:</span></td>
 		<td class="row2"><input type="text" name="min_posts" size="5" maxlength="10" value="{MINIMUM}" /></td>
 	</tr>
-	<tr>
-		<td class="row1" width="38%"><span class="gen">{L_RANK_MAXIMUM}:</span></td>
-		<td class="row2"><input type="text" name="max_posts" size="5" maxlength="10" value="{MAXIMUM}" /></td>
-	</tr>
 	<tr>
 		<td class="row1" width="38%"><span class="gen">{L_RANK_IMAGE}:</span><br />
 		<span class="gensmall">{L_RANK_IMAGE_EXPLAIN}</span></td>
diff --git a/phpBB/templates/subSilver/admin/ranks_list_body.tpl b/phpBB/templates/subSilver/admin/ranks_list_body.tpl
index 90466479ce..9060e5841b 100644
--- a/phpBB/templates/subSilver/admin/ranks_list_body.tpl
+++ b/phpBB/templates/subSilver/admin/ranks_list_body.tpl
@@ -7,7 +7,6 @@
 	<tr>
 		<th class="thCornerL">{L_RANK}</th>
         <th class="thTop">{L_RANK_MINIMUM}</th>
-        <th class="thTop">{L_RANK_MAXIMUM}</th>
 		<th class="thTop">{L_SPECIAL_RANK}</th>
 		<th class="thTop">{L_EDIT}</th>
 		<th class="thCornerR">{L_DELETE}</th>
@@ -16,7 +15,6 @@
 	<tr>
 		<td class="{ranks.ROW_CLASS}" align="center">{ranks.RANK}</td>
         <td class="{ranks.ROW_CLASS}" align="center">{ranks.RANK_MIN}</td>
-        <td class="{ranks.ROW_CLASS}" align="center">{ranks.RANK_MAX}</td>
 		<td class="{ranks.ROW_CLASS}" align="center">{ranks.SPECIAL_RANK}</td>
 		<td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_EDIT}">{L_EDIT}</td>
 		<td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_DELETE}">{L_DELETE}</td>