diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index be8e2b0bcf..d674106eb8 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -1774,21 +1774,21 @@ const setupUsersCollection = users => {
   });
 
   /// DEFAULT INDEXES ON USERS
-  users.createIndex('username', { unique: true, sparse: true });
-  users.createIndex('emails.address', { unique: true, sparse: true });
-  users.createIndex('services.resume.loginTokens.hashedToken',
+  users.createIndexAsync('username', { unique: true, sparse: true });
+  users.createIndexAsync('emails.address', { unique: true, sparse: true });
+  users.createIndexAsync('services.resume.loginTokens.hashedToken',
     { unique: true, sparse: true });
-  users.createIndex('services.resume.loginTokens.token',
+  users.createIndexAsync('services.resume.loginTokens.token',
     { unique: true, sparse: true });
   // For taking care of logoutOtherClients calls that crashed before the
   // tokens were deleted.
-  users.createIndex('services.resume.haveLoginTokensToDelete',
+  users.createIndexAsync('services.resume.haveLoginTokensToDelete',
     { sparse: true });
   // For expiring login tokens
-  users.createIndex("services.resume.loginTokens.when", { sparse: true });
+  users.createIndexAsync("services.resume.loginTokens.when", { sparse: true });
   // For expiring password tokens
-  users.createIndex('services.password.reset.when', { sparse: true });
-  users.createIndex('services.password.enroll.when', { sparse: true });
+  users.createIndexAsync('services.password.reset.when', { sparse: true });
+  users.createIndexAsync('services.password.enroll.when', { sparse: true });
 };
 
 
diff --git a/packages/accounts-oauth/oauth_common.js b/packages/accounts-oauth/oauth_common.js
index bfb99b0a5d..7762de91f8 100644
--- a/packages/accounts-oauth/oauth_common.js
+++ b/packages/accounts-oauth/oauth_common.js
@@ -36,7 +36,7 @@ Accounts.oauth.registerService = name => {
     // so this should be a unique index. You might want to add indexes for other
     // fields returned by your service (eg services.github.login) but you can do
     // that in your app.
-    Meteor.users.createIndex(`services.${name}.id`, {unique: true, sparse: true});
+    Meteor.users.createIndexAsync(`services.${name}.id`, {unique: true, sparse: true});
   }
 };
 
diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index 198b7a9c34..be65c679e5 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -1054,9 +1054,9 @@ Accounts.createUser = (options, callback) => {
 ///
 /// PASSWORD-SPECIFIC INDEXES ON USERS
 ///
-Meteor.users.createIndex('services.email.verificationTokens.token',
-                          { unique: true, sparse: true });
-Meteor.users.createIndex('services.password.reset.token',
-                          { unique: true, sparse: true });
-Meteor.users.createIndex('services.password.enroll.token',
-                          { unique: true, sparse: true });
+Meteor.users.createIndexAsync('services.email.verificationTokens.token',
+                              { unique: true, sparse: true });
+Meteor.users.createIndexAsync('services.password.reset.token',
+                              { unique: true, sparse: true });
+Meteor.users.createIndexAsync('services.password.enroll.token',
+                              { unique: true, sparse: true });
diff --git a/packages/accounts-passwordless/passwordless_server.js b/packages/accounts-passwordless/passwordless_server.js
index 928c5617c6..7175ac45ab 100644
--- a/packages/accounts-passwordless/passwordless_server.js
+++ b/packages/accounts-passwordless/passwordless_server.js
@@ -235,11 +235,11 @@ Accounts.sendLoginTokenEmail = ({ userId, sequence, email, extra = {} }) => {
 };
 
 const setupUsersCollection = () => {
-  Meteor.users.createIndex('services.passwordless.tokens.token', {
+  Meteor.users.createIndexAsync('services.passwordless.tokens.token', {
     unique: true,
     sparse: true,
   });
-  Meteor.users.createIndex('services.passwordless.token', {
+  Meteor.users.createIndexAsync('services.passwordless.token', {
     unique: true,
     sparse: true,
   });
diff --git a/packages/oauth/pending_credentials.js b/packages/oauth/pending_credentials.js
index c9fc60cf80..5dcfd81d19 100644
--- a/packages/oauth/pending_credentials.js
+++ b/packages/oauth/pending_credentials.js
@@ -16,9 +16,9 @@ OAuth._pendingCredentials = new Mongo.Collection(
     _preventAutopublish: true
   });
 
-OAuth._pendingCredentials.createIndex('key', { unique: true });
-OAuth._pendingCredentials.createIndex('credentialSecret');
-OAuth._pendingCredentials.createIndex('createdAt');
+OAuth._pendingCredentials.createIndexAsync('key', { unique: true });
+OAuth._pendingCredentials.createIndexAsync('credentialSecret');
+OAuth._pendingCredentials.createIndexAsync('createdAt');
 
 
 
diff --git a/packages/service-configuration/service_configuration_server.js b/packages/service-configuration/service_configuration_server.js
index c853b66933..16427463c4 100644
--- a/packages/service-configuration/service_configuration_server.js
+++ b/packages/service-configuration/service_configuration_server.js
@@ -5,7 +5,7 @@ import { Meteor } from 'meteor/meteor';
 // otherwise lead to an inconsistent database state (when there are multiple
 // configurations for a single service, which configuration is correct?)
 try {
-  ServiceConfiguration.configurations.createIndex(
+  ServiceConfiguration.configurations.createIndexAsync(
     { service: 1 },
     { unique: true }
   );