diff --git a/Plugins/AntiKickAutoRejoin.pm b/Plugins/AntiKickAutoRejoin.pm
index f399c042..10e7ab43 100644
--- a/Plugins/AntiKickAutoRejoin.pm
+++ b/Plugins/AntiKickAutoRejoin.pm
@@ -46,7 +46,7 @@ sub on_kick {
 
   $channel = lc $channel;
   return 0 if not $self->{pbot}->{chanops}->can_gain_ops($channel);
-  return 0 if $reason eq '*BANG!*';
+  return 0 if $reason eq '*BANG!*'; # roulette
 
   if (not exists $self->{kicks}->{$channel}
       or not exists $self->{kicks}->{$channel}->{$target}) {
@@ -64,6 +64,8 @@ sub on_join {
 
   $channel = lc $channel;
   return 0 if not $self->{pbot}->{chanops}->can_gain_ops($channel);
+  return 0 if $self->{pbot}->{antiflood}->whitelisted($channel, "$nick!$user\@$host");
+  return 0 if $self->{pbot}->{admins}->loggedin($channel, "$nick!$user\@$host");
 
   if (exists $self->{kicks}->{$channel}
       and exists $self->{kicks}->{$channel}->{$nick}) {