diff --git a/packages/accounts-password/email_tests.js b/packages/accounts-password/email_tests.js
index c5a57c9698..e657270617 100644
--- a/packages/accounts-password/email_tests.js
+++ b/packages/accounts-password/email_tests.js
@@ -96,7 +96,7 @@
       getValidateEmailToken(email2, test, expect);
     },
     function (test, expect) {
-      Meteor.validateEmail(validateEmailToken, expect(function(error) {
+      Accounts.validateEmail(validateEmailToken, expect(function(error) {
         test.isFalse(error);
       }));
       // ARGH! ON QUIESCE!!
@@ -124,7 +124,7 @@
       getValidateEmailToken(email3, test, expect);
     },
     function (test, expect) {
-      Meteor.validateEmail(validateEmailToken, expect(function(error) {
+      Accounts.validateEmail(validateEmailToken, expect(function(error) {
         test.isFalse(error);
       }));
     },
diff --git a/packages/accounts-password/passwords_client.js b/packages/accounts-password/passwords_client.js
index bb91131117..3cc22f82c0 100644
--- a/packages/accounts-password/passwords_client.js
+++ b/packages/accounts-password/passwords_client.js
@@ -168,7 +168,7 @@
   //
   // @param token {String}
   // @param callback (optional) {Function(error|undefined)}
-  Meteor.validateEmail = function(token, callback) {
+  Accounts.validateEmail = function(token, callback) {
     if (!token)
       throw new Error("Need to pass token");
 
diff --git a/packages/accounts-ui-unstyled/login_buttons.js b/packages/accounts-ui-unstyled/login_buttons.js
index 51bda4782e..20da5dbf02 100644
--- a/packages/accounts-ui-unstyled/login_buttons.js
+++ b/packages/accounts-ui-unstyled/login_buttons.js
@@ -474,10 +474,10 @@
 
   // Needs to be in Meteor.startup because of a package loading order
   // issue. We can't be sure that accounts-password is loaded earlier
-  // than accounts-ui so Meteor.validateEmail might not be defined.
+  // than accounts-ui so Accounts.validateEmail might not be defined.
   Meteor.startup(function () {
     if (Accounts._validateEmailToken) {
-      Meteor.validateEmail(Accounts._validateEmailToken, function(error) {
+      Accounts.validateEmail(Accounts._validateEmailToken, function(error) {
         Accounts._enableAutoLogin();
         if (!error)
           Session.set(JUST_VALIDATED_USER_KEY, true);