diff --git a/app/config/locale/templates/email-inner-base.tpl b/app/config/locale/templates/email-inner-base.tpl
index 8cef391d2f..d39ffc0dcd 100644
--- a/app/config/locale/templates/email-inner-base.tpl
+++ b/app/config/locale/templates/email-inner-base.tpl
@@ -1,5 +1,12 @@
 <p>{{hello}}</p>
 <p>{{body}}</p>
+<table border="0" cellspacing="0" cellpadding="0" style="padding-top: 10px; padding-bottom: 10px; margin-top: 32px">
+    <tr>
+        <td style="border-radius: 8px; display: block; width: 100%;">
+            <a class="mobile-full-width" rel="noopener" target="_blank" href="{{redirect}}" style="font-size: 14px; font-family: Inter; color: #ffffff; text-decoration: none; background-color: #FD366E; border-radius: 8px; padding: 9px 14px; border: 1px solid #FD366E; display: inline-block; text-align:center; box-sizing: border-box;">Accept invite</a>
+        </td>
+    </tr>
+</table>
 <p><a href="{{redirect}}" target="_blank">{{redirect}}</a></p>
 <p>{{footer}}</p>
 <p style="margin-bottom: 32px">
diff --git a/app/config/locale/translations/en.json b/app/config/locale/translations/en.json
index d9dfddb017..4e40fac972 100644
--- a/app/config/locale/translations/en.json
+++ b/app/config/locale/translations/en.json
@@ -48,7 +48,7 @@
     "emails.recovery.signature": "{{project}} team",
     "emails.invitation.subject": "Invitation to %s Team at %s",
     "emails.invitation.hello": "Hello {{user}},",
-    "emails.invitation.body": "This mail was sent to you because {{b}}{{owner}}{{/b}} wanted to invite you to become a member of the {{b}}{{team}}{{/b}} team at {{b}}{{project}}{{/b}}.",
+    "emails.invitation.body": "This mail was sent to you because {{b}}{{owner}}{{/b}} invited you to become a member of the {{b}}{{team}}{{/b}} team at {{b}}{{project}}{{/b}}.",
     "emails.invitation.footer": "If you are not interested, you can ignore this message.",
     "emails.invitation.thanks": "Thanks,",
     "emails.invitation.signature": "{{project}} team",
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index f829800b98..59b103d580 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -650,7 +650,7 @@ App::post('/v1/teams/:teamId/memberships')
                     'owner' => $user->getAttribute('name'),
                     'direction' => $locale->getText('settings.direction'),
                     /* {{user}}, {{team}}, {{redirect}} and {{project}} are required in default and custom templates */
-                    'user' => $user->getAttribute('name'),
+                    'user' => $invitee->getAttribute('name'),
                     'team' => $team->getAttribute('name'),
                     'redirect' => $url,
                     'project' => $projectName