diff --git a/sections/ajax/forum/main.php b/sections/ajax/forum/main.php
index 9b0ae8dc..9e1bd235 100644
--- a/sections/ajax/forum/main.php
+++ b/sections/ajax/forum/main.php
@@ -82,6 +82,11 @@
 		'sticky' => $Sticky == 1
 	);
 }
+// ...And an extra one to catch the last category.
+if (!empty($JsonForums) && !empty($JsonCategory)) {
+	$JsonCategory['forums'] = $JsonForums;
+	$JsonCategories[] = $JsonCategory;
+}
 
 print json_encode(
 	array(
diff --git a/sections/tools/index.php b/sections/tools/index.php
index b3a92ecd..6658f68b 100644
--- a/sections/tools/index.php
+++ b/sections/tools/index.php
@@ -265,7 +265,9 @@
 		//TODO: Clean up db table ip_bans.
 		include("managers/bans.php");
 		break;
-
+	case 'quick_ban':
+		include("misc/quick_ban.php");
+		break;
 	//Data
 	case 'registration_log':
 		include('data/registration_log.php');
diff --git a/sections/tools/misc/quick_ban.php b/sections/tools/misc/quick_ban.php
new file mode 100644
index 00000000..5c190d2b
--- /dev/null
+++ b/sections/tools/misc/quick_ban.php
@@ -0,0 +1,24 @@
+<?php
+
+if(!check_perms('admin_manage_ipbans')) { error(403); }
+	if(isset($_GET['perform'])) {
+		if($_GET['perform'] == 'delete') {
+                	if(!is_number($_GET['id']) || $_GET['id'] == ''){ error(0); }
+                	$DB->query('DELETE FROM ip_bans WHERE ID='.$_GET['id']);
+			$Bans = $Cache->delete_value('ip_bans');
+		}
+		elseif($_GET['perform'] == 'create') {
+			$Notes = db_string($_GET['notes']);
+        		$IP = ip2unsigned($_GET['ip']); //Sanitized by Validation regex
+                        $DB->query("INSERT INTO ip_bans
+                                (FromIP, ToIP, Reason) VALUES
+                                ('$IP','$IP', '$Notes')");
+                        $ID = $DB->inserted_id();
+                        $Bans = $Cache->get_value('ip_bans');
+                        $Bans[$ID] = array($ID, $Start, $End);
+                        $Cache->cache_value('ip_bans', $Bans, 0);
+        }
+}
+
+
+?>
diff --git a/sections/userhistory/ip_history.php b/sections/userhistory/ip_history.php
index c2e22201..449e2260 100644
--- a/sections/userhistory/ip_history.php
+++ b/sections/userhistory/ip_history.php
@@ -29,7 +29,45 @@
 <script type="text/javascript">
 function ShowIPs(rowname) {
 	$('tr[name="'+rowname+'"]').toggle();
+
 }
+function Ban(ip, id, elemID) {
+	var notes = prompt("Enter notes for this ban"); 
+	if(notes != null && notes.length > 0) {
+		var xmlhttp;
+		if (window.XMLHttpRequest) {
+  			xmlhttp=new XMLHttpRequest();
+  		} else {
+  			xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");
+  		}
+		xmlhttp.onreadystatechange=function() {
+  			if (xmlhttp.readyState==4 && xmlhttp.status==200) {
+				document.getElementById(elemID).innerHTML = "<strong>[Banned]</strong>";
+			}
+  		}
+		xmlhttp.open("GET","tools.php?action=quick_ban&perform=create&ip=" + ip + "&notes=" + notes,true);
+		xmlhttp.send();
+	}
+
+}
+/*
+function UnBan(ip, id, elemID) {
+		var xmlhttp;
+		if (window.XMLHttpRequest) {
+  			xmlhttp=new XMLHttpRequest();
+  		} else {
+  			xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");
+  		}
+		xmlhttp.onreadystatechange=function() {
+  			if (xmlhttp.readyState==4 && xmlhttp.status==200) {
+				document.getElementById(elemID).innerHTML = "Ban";
+				document.getElementById(elemID).onClick = function() { Ban(ip, id, elemID); return false;};
+			}
+		}
+		xmlhttp.open("GET","tools.php?action=quick_ban&perform=delete&id="+id,true);
+		xmlhttp.send();
+}
+ */
 </script>
 <div class="thin">
 <?
@@ -92,6 +130,8 @@ function ShowIPs(rowname) {
 			<td>Elapsed</td>
 		</tr>
 <?
+$counter = 0;
+$IPs = array();
 $Results = $DB->to_array();
 foreach($Results as $Index => $Result) {
 	list($IP, $StartTime, $EndTime, $UserIDs, $UserStartTimes, $UserEndTimes, $Usernames, $UsersEnabled, $UsersDonor, $UsersWarned) = $Result;
@@ -111,8 +151,28 @@ function ShowIPs(rowname) {
 ?>
 		<tr class="rowa">
 			<td>
-				<?=$IP?> (<?=get_cc($IP)?>)				<br />
-				<?=get_host($IP)?>
+				<?=$IP?> (<?=get_cc($IP)?>)
+<?
+        	if(!isset($IPs[$IP])) {
+                	$sql = "SELECT ID, FromIP, ToIP FROM ip_bans WHERE '".ip2unsigned($IP)."' BETWEEN FromIP AND ToIP LIMIT 1";
+			$DB->query($sql);
+			
+			if($DB->record_count() > 0) {
+                        	$IPs[$IP] = true; 
+			?>
+				<strong>[Banned]
+			<? }
+                	else {
+				$IPs[$IP] = false; ?>
+				<a id="<?=$counter?>" href="#" onclick="Ban('<?=$IP?>', '<?=$ID?>', '<?=$counter?>'); this.onclick=null;return false;">[Ban]</a>
+<?			}
+			$counter++;
+        	}       
+?>
+
+
+			<br />
+			<?=get_host($IP)?>
 			<?=($HasDupe ? 
 			'<a href="#" onclick="ShowIPs('.$Index.'); return false;">('.count($UserIDs).')</a>' 
 			: '(0)')?></td>
@@ -149,3 +209,4 @@ function ShowIPs(rowname) {
 <?
 show_footer();
 ?>
+