diff --git a/PBot/AntiFlood.pm b/PBot/AntiFlood.pm
index 38225d54..29df13f7 100644
--- a/PBot/AntiFlood.pm
+++ b/PBot/AntiFlood.pm
@@ -623,6 +623,11 @@ sub check_bans {
               next;
             }
 
+            if(defined $nickserv_account and $baninfo->{type} eq '+q' and $mask =~ /^\$a:(.*)/ and lc $1 eq lc $nickserv_account) {
+              $self->{pbot}->logger->log("anti-flood: [check-bans] Hostmask ($mask) matches account ($nickserv_account), disregarding\n");
+              next;
+            }
+
             if(not defined $bans) {
               $bans = [];
             }
diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm
index 3b3db5e7..e6b58f4c 100644
--- a/PBot/VERSION.pm
+++ b/PBot/VERSION.pm
@@ -13,7 +13,7 @@ use warnings;
 # These are set automatically by the build/commit script
 use constant {
   BUILD_NAME     => "PBot",
-  BUILD_REVISION => 500,
+  BUILD_REVISION => 501,
   BUILD_DATE     => "2014-03-04",
 };