--- src/mod/irc.mod/chan.c	2008-02-16 21:41:09.000000000 +0000
+++ src/mod/irc.mod/chan.c	2008-05-29 12:00:09.000000000 +0100
@@ -965,10 +965,10 @@ 
         q = strchr(p, ' ');
         if (q != NULL) {
           *q = 0;
-          set_key(chan, p);
+          set_keyegg(chan, p);
           strcpy(p, q + 1);
         } else {
-          set_key(chan, p);
+          set_keyegg(chan, p);
           *p = 0;
         }
       }
@@ -982,6 +982,7 @@ 
         chan->status |= CHAN_ASKEDMODES;
     }
     if (msg[i] == 'l') {
+      chan->channel.mode |= CHANLIMIT;
       p = strchr(msg, ' ');
       if (p != NULL) {          /* test for null limit assignment */
         p++;