diff --git a/lib/jitsu.js b/lib/jitsu.js
index 7ede064..d4a79b9 100644
--- a/lib/jitsu.js
+++ b/lib/jitsu.js
@@ -216,7 +216,7 @@ jitsu.setupUserNoWarn = function(callback) {
       if (err) {
         return callback(err);
       }
-      if (/^y[es]*/i.test(res.reset)) {
+      if (/^y[es]?/i.test(res['request password reset'])) {
         return jitsu.commands.run(['users', 'forgot', username], callback);
       }
       
diff --git a/lib/jitsu/commands/users.js b/lib/jitsu/commands/users.js
index ee85792..0d9ff31 100644
--- a/lib/jitsu/commands/users.js
+++ b/lib/jitsu/commands/users.js
@@ -231,7 +231,7 @@ users.forgot = function (username, shake, callback) {
     }
 
     winston.info('Check your email for instructions on resetting your password.');
-    callback();
+    callback(new Error('Password reset pending, cannot login.'));
   });
 };