diff --git a/PBot/AntiFlood.pm b/PBot/AntiFlood.pm
index e3d6cc23..17238cf3 100644
--- a/PBot/AntiFlood.pm
+++ b/PBot/AntiFlood.pm
@@ -695,6 +695,7 @@ sub check_nickserv_accounts {
       if(exists $self->{message_history}->{$mask}->{nickserv_accounts} and exists $self->{message_history}->{$mask}->{nickserv_accounts}->{$account}) {
         # pre-existing mask found using this account previously
         #$self->{pbot}->logger->log("anti-flood: [check-account] $nick [nickserv: $account] seen previously as $mask.\n");
+        $hostmask = $mask;
       }
       else {
         # no nickserv account set yet
diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm
index b8e13808..a7c5f3b8 100644
--- a/PBot/VERSION.pm
+++ b/PBot/VERSION.pm
@@ -13,8 +13,8 @@ use warnings;
 # These are set automatically by the build/commit script
 use constant {
   BUILD_NAME     => "PBot",
-  BUILD_REVISION => 519,
-  BUILD_DATE     => "2014-03-09",
+  BUILD_REVISION => 520,
+  BUILD_DATE     => "2014-03-10",
 };
 
 1;