diff --git a/tools/deploy.js b/tools/deploy.js
index a05db5d40f..201576e253 100644
--- a/tools/deploy.js
+++ b/tools/deploy.js
@@ -661,7 +661,8 @@ var claim = function (site) {
   });
 
   if (result.errorMessage) {
-    if (! auth.currentUsername() &&
+    auth.pollForRegistrationCompletion();
+    if (! auth.loggedInUsername() &&
         auth.registrationUrl()) {
       process.stderr.write(
 "You need to set a password on your Meteor developer account before\n" +