diff --git a/services/web/app/src/Features/User/UserRegistrationHandler.js b/services/web/app/src/Features/User/UserRegistrationHandler.js
index f56f8135e9..0c6ce5ed80 100644
--- a/services/web/app/src/Features/User/UserRegistrationHandler.js
+++ b/services/web/app/src/Features/User/UserRegistrationHandler.js
@@ -122,7 +122,7 @@ const UserRegistrationHandler = {
         const ONE_WEEK = 7 * 24 * 60 * 60 // seconds
         OneTimeTokenHandler.getNewToken(
           'password',
-          user._id,
+          { user_id: user._id.toString(), email },
           { expiresIn: ONE_WEEK },
           (err, token) => {
             if (err != null) {
diff --git a/services/web/test/unit/src/User/UserRegistrationHandlerTests.js b/services/web/test/unit/src/User/UserRegistrationHandlerTests.js
index 005e7ce144..2c14b56b46 100644
--- a/services/web/test/unit/src/User/UserRegistrationHandlerTests.js
+++ b/services/web/test/unit/src/User/UserRegistrationHandlerTests.js
@@ -282,8 +282,9 @@ describe('UserRegistrationHandler', function() {
       })
 
       it('should generate a new password reset token', function() {
+        const data = { user_id: this.user._id.toString(), email: this.email }
         return this.OneTimeTokenHandler.getNewToken
-          .calledWith('password', this.user_id, { expiresIn: 7 * 24 * 60 * 60 })
+          .calledWith('password', data, { expiresIn: 7 * 24 * 60 * 60 })
           .should.equal(true)
       })