Honor self.isWaitingForNickServ
Fix logic