diff --git a/packages/fxa-auth-server/lib/routes/password.js b/packages/fxa-auth-server/lib/routes/password.js
index de9577888c3..6ce029ee710 100644
--- a/packages/fxa-auth-server/lib/routes/password.js
+++ b/packages/fxa-auth-server/lib/routes/password.js
@@ -87,17 +87,16 @@ module.exports = function(
                       wrapKb: wrapKb,
                       emailVerified: emailRecord.emailVerified,
                     })
-                    .then(keyFetchToken => {
-                      return db
-                        .createPasswordChangeToken({
+                    .then(async keyFetchToken => {
+                      const passwordChangeToken = await db.createPasswordChangeToken(
+                        {
                           uid: emailRecord.uid,
-                        })
-                        .then(passwordChangeToken => {
-                          return {
-                            keyFetchToken: keyFetchToken,
-                            passwordChangeToken: passwordChangeToken,
-                          };
-                        });
+                        }
+                      );
+                      return {
+                        keyFetchToken: keyFetchToken,
+                        passwordChangeToken: passwordChangeToken,
+                      };
                     });
                 });
             },