diff --git a/src/regchannel.cpp b/src/regchannel.cpp
index f9e9aed96..e0f0c742c 100644
--- a/src/regchannel.cpp
+++ b/src/regchannel.cpp
@@ -768,8 +768,11 @@ bool ChannelInfo::CheckKick(User *user)
 		{
 			AutoKick *autokick = this->GetAkick(j);
 
-			if (autokick->HasFlag(AK_ISNICK) && autokick->nc == nc)
-				do_kick = true;
+			if (autokick->HasFlag(AK_ISNICK))
+			{
+				if (autokick->nc == nc)
+					do_kick = true;
+			}
 			else
 			{
 				Entry akick_mask(autokick->mask);