diff --git a/migrations/users/20181023_veteran_pet_ladder.js b/migrations/users/20181023_veteran_pet_ladder.js
index cbe8044d53..4f33820bba 100644
--- a/migrations/users/20181023_veteran_pet_ladder.js
+++ b/migrations/users/20181023_veteran_pet_ladder.js
@@ -2,93 +2,65 @@
 const MIGRATION_NAME = '20181023_veteran_pet_ladder';
 import { model as User } from '../../website/server/models/user';
 
-function processUsers (lastId) {
+const progressCount = 1000;
+let count = 0;
+
+async function updateUser (user) {
+  count++;
+
+  const set = {};
+
+  set.migration = MIGRATION_NAME;
+
+  if (user.items.pets['Bear-Veteran']) {
+    set['items.pets.Fox-Veteran'] = 5;
+  } else if (user.items.pets['Lion-Veteran']) {
+    set['items.pets.Bear-Veteran'] = 5;
+  } else if (user.items.pets['Tiger-Veteran']) {
+    set['items.pets.Lion-Veteran'] = 5;
+  } else if (user.items.pets['Wolf-Veteran']) {
+    set['items.pets.Tiger-Veteran'] = 5;
+  } else {
+    set['items.pets.Wolf-Veteran'] = 5;
+  }
+
+  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+
+  return await User.update({_id: user._id}, {$set: set}).exec();
+}
+
+module.exports = async function processUsers () {
   let query = {
     migration: {$ne: MIGRATION_NAME},
     'flags.verifiedUsername': true,
   };
 
   const fields = {
-    'items.pets': 1,
+    _id: 1,
+    items: 1,
+    migration: 1,
+    flags: 1,
   };
 
-  if (lastId) {
-    query._id = {
-      $gt: lastId,
-    };
-  }
+  while (true) { // eslint-disable-line no-constant-condition
+    const users = await User // eslint-disable-line no-await-in-loop
+      .find(query)
+      .limit(250)
+      .sort({_id: 1})
+      .select(fields)
+      .lean()
+      .exec();
 
-  return User.find(query)
-    .limit(250)
-    .sort({_id: 1})
-    .select(fields)
-    .exec()
-    .then(updateUsers)
-    .catch((err) => {
-      console.log(err);
-      return exiting(1, `ERROR! ${err}`);
-    });
-}
-
-const progressCount = 1000;
-let count = 0;
-
-function updateUsers (users) {
-  if (!users || users.length === 0) {
-    console.warn('All appropriate users found and modified.');
-    displayData();
-    return;
-  }
-
-  let userPromises = users.map(updateUser);
-  let lastUser = users[users.length - 1];
-
-  return Promise.all(userPromises)
-    .then(() => {
-      return processUsers(lastUser._id);
-    });
-}
-
-function updateUser (user) {
-  count++;
-
-  user.migration = MIGRATION_NAME;
-
-  if (user.items.pets['Bear-Veteran']) {
-    user.items.pets['Fox-Veteran'] = 5;
-  } else if (user.items.pets['Lion-Veteran']) {
-    user.items.pets['Bear-Veteran'] = 5;
-  } else if (user.items.pets['Tiger-Veteran']) {
-    user.items.pets['Lion-Veteran'] = 5;
-  } else if (user.items.pets['Wolf-Veteran']) {
-    user.items.pets['Tiger-Veteran'] = 5;
-  } else {
-    user.items.pets['Wolf-Veteran'] = 5;
-  }
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  return user.save();
-}
-
-function displayData () {
-  console.warn(`\n${count} users processed\n`);
-  return exiting(0);
-}
-
-function exiting (code, msg) {
-  code = code || 0; // 0 = success
-  if (code && !msg) {
-    msg = 'ERROR!';
-  }
-  if (msg) {
-    if (code) {
-      console.error(msg);
+    if (users.length === 0) {
+      console.warn('All appropriate users found and modified.');
+      console.warn(`\n${count} users processed\n`);
+      break;
     } else {
-      console.log(msg);
+      query._id = {
+        $gt: users[users.length - 1],
+      };
     }
-  }
-  process.exit(code);
-}
 
-module.exports = processUsers;
+    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
+  }
+};