diff --git a/src/channel.c b/src/channel.c
index 3e47278..af30d4e 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1873,7 +1873,7 @@ void user_join(struct Client * client_p, struct Client * source_p, const char *
 				continue;
 			}
 
-			if(ConfigChannel.admin_on_channel_create)
+			if(ConfigChannel.admin_on_channel_create && ConfigChannel.use_admin)
 				flags = CHFL_ADMIN | CHFL_CHANOP;
 			else
 				flags = CHFL_CHANOP;