diff --git a/modules/core/m_kick.c b/modules/core/m_kick.c
index 1567f2f9..eb72d1c9 100644
--- a/modules/core/m_kick.c
+++ b/modules/core/m_kick.c
@@ -97,7 +97,7 @@ m_kick(struct Client *client_p, struct Client *source_p, int parc, const char *p
 			return 0;
 		}
 
-		if(!is_chanop(msptr))
+		if(get_channel_access(source_p, msptr) < CHFL_CHANOP)
 		{
 			if(MyConnect(source_p))
 			{
diff --git a/modules/m_topic.c b/modules/m_topic.c
index cf7b2853..c8328f1c 100644
--- a/modules/m_topic.c
+++ b/modules/m_topic.c
@@ -125,7 +125,7 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 		}
 
 		if(((chptr->mode.mode & MODE_TOPICLIMIT) == 0 ||
-					is_chanop(msptr)) &&
+					get_channel_access(source_p, msptr) < CHFL_CHANOP) &&
 				(!MyClient(source_p) ||
 				 can_send(chptr, source_p, msptr)))
 		{