diff --git a/packages/worker/src/constants/templates/passwordRecovery.hbs b/packages/worker/src/constants/templates/passwordRecovery.hbs
index 6ebe60646..128398cdb 100644
--- a/packages/worker/src/constants/templates/passwordRecovery.hbs
+++ b/packages/worker/src/constants/templates/passwordRecovery.hbs
@@ -6,7 +6,7 @@
       <tr>
         <td class="content-cell">
           <div class="f-fallback">
-            <h1>Hi {{ email }},</h1>
+            <h1>Hi {{#if name}}{{ name }}{{else}}{{ email }}{{/if}},</h1>
             <p>You recently requested to reset your password for your {{ company }} account in your Budibase platform. Use the button below to reset it. <strong>This password reset is only valid for the next 24 hours.</strong></p>
             <!-- Action -->
             <table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation">
diff --git a/packages/worker/src/constants/templates/welcome.hbs b/packages/worker/src/constants/templates/welcome.hbs
index b509ad5e3..18ea572bb 100644
--- a/packages/worker/src/constants/templates/welcome.hbs
+++ b/packages/worker/src/constants/templates/welcome.hbs
@@ -6,7 +6,7 @@
       <tr>
         <td class="content-cell">
           <div class="f-fallback">
-            <h1>Welcome, {{ email }}!</h1>
+            <h1>Welcome, {{#if name}}{{ name }}{{else}}{{ email }}{{/if}}!</h1>
             <p>Thanks for getting started with {{ company }}'s Budibase platform.</p>
             <p>For reference, here's how to login:</p>
             <table class="attributes" width="100%" cellpadding="0" cellspacing="0" role="presentation">
diff --git a/packages/worker/src/utilities/email.js b/packages/worker/src/utilities/email.js
index fb3059190..25a2d3520 100644
--- a/packages/worker/src/utilities/email.js
+++ b/packages/worker/src/utilities/email.js
@@ -83,10 +83,15 @@ async function buildEmail(purpose, email, context, { user, contents } = {}) {
   }
   base = base.contents
   body = body.contents
+  let name = user ? user.name : undefined
+  if (user && !name && user.firstName) {
+    name = user.lastName ? `${user.firstName} ${user.lastName}` : user.firstName
+  }
   context = {
     ...context,
     contents,
     email,
+    name,
     user: user || {},
   }