diff --git a/include/i18n/en_US/templates/email/message.autoresp.yaml b/include/i18n/en_US/templates/email/message.autoresp.yaml
index 30c641de0f74048f297333de499197865c7a2dbd..61905d57f04f06f754f0c30a6f590f3eaca48292 100644
--- a/include/i18n/en_US/templates/email/message.autoresp.yaml
+++ b/include/i18n/en_US/templates/email/message.autoresp.yaml
@@ -14,9 +14,9 @@ notes: |
subject: |
Message Confirmation
body: |
- <h3><strong>Dear %{ticket.name.first},</strong></h3>
+ <h3><strong>Dear %{recipient.name.first},</strong></h3>
Your reply to support request <a
- href="%{ticket.client_link}">#%{ticket.number}</a> has been noted
+ href="%{recipient.ticket_link}">#%{ticket.number}</a> has been noted
<br>
<br>
<div style="color: rgb(127, 127, 127); ">
@@ -26,7 +26,7 @@ body: |
<hr>
<div style="color: rgb(127, 127, 127); font-size: small; text-align:
center"><em>You can view the support request progress <a
- href="%{ticket.client_link}">online here</a></em><br>
+ href="%{recipient.ticket_link}">online here</a></em><br>
<a href="http://osticket.com/"><img
src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" alt="Powered by osTicket"
width="126" height="19" style="width: 126px;"></a></div>
diff --git a/include/i18n/en_US/templates/email/ticket.activity.notice.yaml b/include/i18n/en_US/templates/email/ticket.activity.notice.yaml
index 4248931a815db98cd8cd3a7ce35a2048ee07da2c..ee3023175914465493c0e808456bee1f7f858ce9 100644
--- a/include/i18n/en_US/templates/email/ticket.activity.notice.yaml
+++ b/include/i18n/en_US/templates/email/ticket.activity.notice.yaml
@@ -27,9 +27,9 @@ body: |
<hr>
<div style="color: rgb(127, 127, 127); font-size: small; text-align: center;">
<em>You're getting this email because you are a collaborator
- on ticket <a href="%{ticket.client_link}" style="color: rgb(84, 141, 212);"
+ on ticket <a href="%{recipient.ticket_link}" style="color: rgb(84, 141, 212);"
>#%{ticket.number}</a>. To participate, simply reply to this email
- or <a href="%{ticket.client_link}" style="color: rgb(84, 141, 212);"
+ or <a href="%{recipient.ticket_link}" style="color: rgb(84, 141, 212);"
>click here</a> for a complete archive of the ticket thread.</em>
</div>
<div style="text-align: center;"> <a href="http://osticket.com/"><img
diff --git a/include/i18n/en_US/templates/email/ticket.autoreply.yaml b/include/i18n/en_US/templates/email/ticket.autoreply.yaml
index e50551566ac31ec72311dcd584fe70bde5bfc467..eb7a50c5a6e3852d636a89214a36c03967c327cd 100644
--- a/include/i18n/en_US/templates/email/ticket.autoreply.yaml
+++ b/include/i18n/en_US/templates/email/ticket.autoreply.yaml
@@ -21,11 +21,11 @@ body: |
float: right; margin: 0px 0px 10px 10px;">
<br>
<br>
- <strong>Dear %{ticket.name.first},</strong>
+ <strong>Dear %{recipient.name.first},</strong>
<br>
<br>
A request for support has been created and assigned ticket <a
- href="%{ticket.client_link}">#%{ticket.number}</a> with the following
+ href="%{recipient.ticket_link}">#%{ticket.number}</a> with the following
automatic reply
<br>
<br>
@@ -43,7 +43,7 @@ body: |
<div style="color: rgb(127, 127, 127); font-size: small; text-align:
center;"><em>We hope this response has sufficiently answered your questions.
If not, please do not send another email. Instead, reply to this email
- or <a href="%{ticket.client_link}"><span style="color: rgb(84, 141,
+ or <a href="%{recipient.ticket_link}"><span style="color: rgb(84, 141,
212);" >login to your account</span></a> for a complete archive of all
your support requests and responses.</em></div>
<div style="text-align: center;">
diff --git a/include/i18n/en_US/templates/email/ticket.autoresp.yaml b/include/i18n/en_US/templates/email/ticket.autoresp.yaml
index ebdfde6f106bed221ff5ebe44af66f4456dea58f..47e05b5995ab8e918f33ff58292e8eb67ef8631b 100644
--- a/include/i18n/en_US/templates/email/ticket.autoresp.yaml
+++ b/include/i18n/en_US/templates/email/ticket.autoresp.yaml
@@ -25,7 +25,7 @@ body: |
</tr>
<tr>
<td style="width:67%; padding-top: 12pt; padding-right: 12pt">
- Dear %{ticket.name.first},
+ Dear %{recipient.name.first},
<br>
<br>
We received your request and assigned ticket #%{ticket.number}
@@ -39,7 +39,7 @@ body: |
<br>
<br>
A representative will follow-up with you as soon as possible.
- You can <a href="%{ticket.client_link}">view this ticket's
+ You can <a href="%{recipient.ticket_link}">view this ticket's
progress online</a>.
<br>
<br>
@@ -54,7 +54,7 @@ body: |
<span style="color: rgb(127, 127, 127); "> If you wish to send
additional comments or information regarding this issue, please
don't open a new ticket. Simply</span> <a
- href="%{ticket.client_link}"><span style="color: rgb(84, 141, 212);"
+ href="%{recipient.ticket_link}"><span style="color: rgb(84, 141, 212);"
>login</span></a> <span style="color: rgb(127, 127, 127);"
>and update the ticket.</span>
<br>
diff --git a/include/i18n/en_US/templates/email/ticket.notice.yaml b/include/i18n/en_US/templates/email/ticket.notice.yaml
index 530f32a1f78fb33bab55b6b7b2942ffdaa798d73..55d0bb0d218acd01e22bffbd20f8a342ce496a06 100644
--- a/include/i18n/en_US/templates/email/ticket.notice.yaml
+++ b/include/i18n/en_US/templates/email/ticket.notice.yaml
@@ -19,11 +19,11 @@ body: |
float: right; margin: 0px 0px 10px 10px;">
<br>
<br>
- <strong>Dear %{ticket.name.first},</strong>
+ <strong>Dear %{recipient.name.first},</strong>
<br>
<br>
Our customer care team has created a ticket, <a
- href="%{ticket.client_link}">#%{ticket.number}</a> on your behalf, with
+ href="%{recipient.ticket_link}">#%{ticket.number}</a> on your behalf, with
the following details and summary:
<br>
<br>
@@ -36,7 +36,7 @@ body: |
<br>
<br>
If need be, a representative will follow-up with you as soon as
- possible. You can also <a href="%{ticket.client_link}">view this
+ possible. You can also <a href="%{recipient.ticket_link}">view this
ticket's progress online</a>.
<br>
<br>
@@ -47,7 +47,7 @@ body: |
<div style="color: rgb(127, 127, 127); font-size: small; "><em>If you
wish to provide additional comments or information regarding the issue,
please do not send another email. Instead, reply to this email or <a
- href="%{ticket.client_link}"><span style="color: rgb(84, 141, 212);"
+ href="%{recipient.ticket_link}"><span style="color: rgb(84, 141, 212);"
>login to your account</span></a> for a complete archive of all your
support requests and responses.</em></div>
<br>
diff --git a/include/i18n/en_US/templates/email/ticket.reply.yaml b/include/i18n/en_US/templates/email/ticket.reply.yaml
index c576a720945eb7b490132aa8d31c30d468da8a17..80774c737635171d069cb4f9fa9e3f4dac8b2989 100644
--- a/include/i18n/en_US/templates/email/ticket.reply.yaml
+++ b/include/i18n/en_US/templates/email/ticket.reply.yaml
@@ -15,7 +15,7 @@ body: |
width="113" height="64" style="float: right; width: 113px; margin: 0px 0px 10px 10px;">
<h3><span style="color: rgb(127, 127, 127); font-weight: normal;
font-family: Georgia; font-size: 30pt">We're Here For You</span></h3>
- <strong>Dear %{ticket.name},</strong>
+ <strong>Dear %%{recipient.name},</strong>
<br>
<br>
%{response}
@@ -29,7 +29,7 @@ body: |
<div style="color: rgb(127, 127, 127); font-size: small; text-align: center;"
><em>We hope this response has sufficiently answered your questions. If
not, please do not send another email. Instead, reply to this email or
- <a href="%{ticket.client_link}" style="color: rgb(84, 141, 212);" >login
+ <a href="%{recipient.ticket_link}" style="color: rgb(84, 141, 212);" >login
to your account</a> for a complete archive of all your support requests
and responses.</em></div>
<div style="text-align: center;">