diff --git a/modules/commands/cs_drop.cpp b/modules/commands/cs_drop.cpp
index 306717c69..a42c8e58e 100644
--- a/modules/commands/cs_drop.cpp
+++ b/modules/commands/cs_drop.cpp
@@ -34,15 +34,13 @@ class CommandCSDrop : public Command
 			return;
 		}
 
-		ChannelInfo *ci = cs_findchan(params[0]);
+		ChannelInfo *ci = cs_findchan(chan);
 		if (ci == NULL)
 		{
 			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
 			return;
 		}
 
-		ci = cs_findchan(chan);
-
 		if (ci->HasFlag(CI_SUSPENDED) && !u->HasCommand("chanserv/drop"))
 		{
 			source.Reply(CHAN_X_SUSPENDED, chan.c_str());
diff --git a/modules/pseudoclients/bs_main.cpp b/modules/pseudoclients/bs_main.cpp
index c64cb5786..a286c54e7 100644
--- a/modules/pseudoclients/bs_main.cpp
+++ b/modules/pseudoclients/bs_main.cpp
@@ -157,7 +157,7 @@ class BotServCore : public Module
 		if (c->HasFlag(CH_INHABIT))
 			return;
 
-		if (c->ci && c->ci->bi && c->users.size() - 1 <= Config->BSMinUsers && c->FindUser(c->ci->bi))
+		if (c->ci && c->ci->bi && u != c->ci->bi && c->users.size() - 1 <= Config->BSMinUsers && c->FindUser(c->ci->bi))
 		{
 			bool persist = c->HasFlag(CH_PERSIST);
 			c->SetFlag(CH_PERSIST);