diff --git a/lib/irc.js b/lib/irc.js
index 23ccfe08..2e326f8a 100644
--- a/lib/irc.js
+++ b/lib/irc.js
@@ -597,9 +597,14 @@ function Client(server, nick, opt) {
 
             // for sasl
             case 'CAP':
-                if (message.args[0] === '*' &&
-                     message.args[1] === 'ACK' &&
-                     message.args[2] === 'sasl ') // there's a space after sasl
+                // if we are debug, log output from the server
+                if (self.opt.debug) {
+                    util.log(message.args[0] + '-')
+                    util.log(message.args[1] + '-')
+                    util.log(message.args[2] + '-')
+                }
+                if (message.args[1] === 'ACK' &&
+                    message.args[2] === 'sasl')
                     self.send('AUTHENTICATE', 'PLAIN');
                 break;
             case 'AUTHENTICATE':
diff --git a/package.json b/package.json
index f70dcdbe..fee6faf8 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,8 @@
     "Chris Nehren <cnehren@pobox.com>",
     "Henri Niemeläinen <aivot-on@iki.fi>",
     "Alex Miles <ghostaldev@gmail.com>",
-    "Simmo Saan <simmo.saan@gmail.com>"
+    "Simmo Saan <simmo.saan@gmail.com>",
+    "Nick Silkey <nick@silkey.org>"
   ],
   "repository": {
     "type": "git",