--- src/iroffer_main.c.orig	Sun Mar 14 11:57:36 2004
+++ src/iroffer_main.c	Mon Mar 29 07:11:32 2004
@@ -1352,6 +1352,12 @@
          if (!gdata.user_nick || strcmp(gdata.config_nick,gdata.user_nick))
            {
              writeserver(WRITESERVER_NORMAL, "NICK %s", gdata.config_nick);
+
+             /* nickserv */
+             if (gdata.nickserv_pass)
+             {
+               privmsg("nickserv","IDENTIFY %s",gdata.nickserv_pass);
+             }
            }
          
          /* update status line */
@@ -1901,6 +1907,9 @@
                ignore->bucket++;
                ignore->lastcontact = gdata.curtime;
                
+               if ( (strcmp(nick,"NickServ") != 0)
+               && (strcmp(nick,"ChanServ") != 0) )
+                 {
                if (!(ignore->flags & IGN_IGNORING) &&
                     (ignore->bucket >= IGN_ON ))
                  {
@@ -1913,6 +1922,7 @@
                            "Auto-ignore activated for %s (%s)",nick,wildhost);
                    
                    write_ignorefile();
+                 }
                  }
                
                if (ignore->flags & IGN_IGNORING)