diff --git a/Admin/Templates/ban_msg.tpl b/Admin/Templates/ban_msg.tpl
index 3d851b1c..b1d44113 100644
--- a/Admin/Templates/ban_msg.tpl
+++ b/Admin/Templates/ban_msg.tpl
@@ -7,7 +7,8 @@
 ##  Copyright:     TravianX (c) 2010-2011. All rights reserved.                ##
 ##                                                                             ##
 #################################################################################
-$ban = mysql_query("SELECT * FROM ".TB_PREFIX."banlist WHERE `uid` = '".$session->uid."'");
+$time = time();
+$ban = mysql_query("SELECT * FROM ".TB_PREFIX."banlist WHERE `uid` = '".$session->uid."' and `end` < '".$time."'");
 $ban1 = mysql_fetch_array($ban);
 ?>
 
diff --git a/Admin/admin.php b/Admin/admin.php
index 9f4c89ef..538634e0 100644
--- a/Admin/admin.php
+++ b/Admin/admin.php
@@ -101,8 +101,7 @@ $timeformat = new timeFormatGenerator;
 												<a href="?p=notregistered">Players Not Activated</a>
 												<br />
 												<a href="?p=search"><b>Search</b></a>
-												<a href="?p=message">Search Messages</a>
-												<a href="?p=message">Search Battle Reports</a>
+												<a href="?p=message">Search Messages/Battle Reports</a>
 												<br />
 												<a href="#"><b>Ban</b></a>
 												<a href="?p=ban">Ban/Unban Players</a>