diff --git a/packages/component-email/src/helpers/Email.js b/packages/component-email/src/helpers/Email.js
index 0f36a7953a84cfcdf4e8c4cd8b14860c7d5ceac8..08b1f3e44a432194d9679df51e8ffa1e7535bb1b 100644
--- a/packages/component-email/src/helpers/Email.js
+++ b/packages/component-email/src/helpers/Email.js
@@ -58,12 +58,7 @@ module.exports = {
         })
     }
     try {
-      await mailService.setupInviteEmail(
-        email,
-        emailType,
-        user.passwordResetToken,
-        url,
-      )
+      await mailService.setupInviteEmail(user, emailType, url)
       return res.status(200).json({})
     } catch (e) {
       logger.error(e)
diff --git a/packages/component-invite/src/helpers/User.js b/packages/component-invite/src/helpers/User.js
index 5ccba0e94832c0a7820331b825c509c76e44d332..5da4184d5a729b6151015a92554ec57788be954f 100644
--- a/packages/component-invite/src/helpers/User.js
+++ b/packages/component-invite/src/helpers/User.js
@@ -25,12 +25,7 @@ module.exports = {
 
     try {
       if (role !== 'reviewer') {
-        await mailService.setupInviteEmail(
-          newUser.email,
-          invitationType,
-          newUser.passwordResetToken,
-          url,
-        )
+        await mailService.setupInviteEmail(newUser, invitationType, url)
       }
 
       return newUser
diff --git a/packages/component-mail-service/src/Mail.js b/packages/component-mail-service/src/Mail.js
index f07fd48dfab032ea3ee314cadc139b2c606341c7..6e53819af265a36240a1878f8d369c1f2f868a04 100644
--- a/packages/component-mail-service/src/Mail.js
+++ b/packages/component-mail-service/src/Mail.js
@@ -7,18 +7,22 @@ const config = require('config')
 const resetPath = config.get('invite-reset-password.url')
 
 module.exports = {
-  setupInviteEmail: async (email, emailType, token, inviteUrl) => {
+  setupInviteEmail: async (user, emailType, inviteUrl) => {
     const replacements = {
       url: `${inviteUrl}${resetPath}?${querystring.encode({
-        email,
-        token,
+        email: user.email,
+        token: user.passwordResetToken,
+        firstName: user.firstName,
+        lastName: user.lastName,
+        affiliation: user.affiliation,
+        title: user.title,
       })}`,
     }
 
     const { htmlBody, textBody } = getEmailBody(emailType, replacements)
     const mailData = {
       from: config.get('mailer.from'),
-      to: email,
+      to: user.email,
       subject: 'Hindawi Invitation',
       text: textBody,
       html: htmlBody,
diff --git a/packages/component-user-manager/src/helpers/User.js b/packages/component-user-manager/src/helpers/User.js
index d2a10aab50845a15fdb45e025542d94a50703b42..a0db58ab11c5b5c9674bc0f897974ec63db66952 100644
--- a/packages/component-user-manager/src/helpers/User.js
+++ b/packages/component-user-manager/src/helpers/User.js
@@ -24,12 +24,7 @@ module.exports = {
     )
 
     try {
-      await mailService.setupInviteEmail(
-        newUser.email,
-        invitationType,
-        newUser.passwordResetToken,
-        url,
-      )
+      await mailService.setupInviteEmail(newUser, invitationType, url)
 
       return newUser
     } catch (e) {