diff --git a/example_scripts/auto_identify.js b/example_scripts/auto_identify.js
index 17e68250..55df6c87 100644
--- a/example_scripts/auto_identify.js
+++ b/example_scripts/auto_identify.js
@@ -47,7 +47,11 @@ var autoIdentify = function(context, message) {
 
 var nickServPasswordIsVisible = function(message) {
   var words = message.split(' ');
-  return words.length == 2 && words[0].toLowerCase() == 'identify';
+
+  // Handle both "/msg NickServ IDENTIFY user pass" and
+  // "/msg NickServ IDENTIFY pass"
+  return ((words.length == 2 || words.length == 3) &&
+          words[0].toLowerCase() == 'identify');
 };
 
 var snoopPassword = function(context, message) {