diff --git a/customize.dist/login.js b/customize.dist/login.js
index ab9fabfa8..4015f8a01 100644
--- a/customize.dist/login.js
+++ b/customize.dist/login.js
@@ -191,7 +191,10 @@ define([
 
             // load the user's object using the legacy credentials
             loadUserObject(opt, waitFor(function (err, rt) {
-                if (err) { return void cb(err); }
+                if (err) {
+                    waitFor.abort();
+                    return void cb(err);
+                }
 
                 // if a proxy is marked as deprecated, it is because someone had a non-owned drive
                 // but changed their password, and couldn't delete their old data.
@@ -199,6 +202,7 @@ define([
                 // allow them to proceed. In time, their old drive should get deleted, since
                 // it will should be pinned by anyone's drive.
                 if (rt.proxy[Constants.deprecatedKey]) {
+                    waitFor.abort();
                     return void cb('NO_SUCH_USER', res);
                 }