diff --git a/job_runner.py b/job_runner.py
index d6392f1c..f0925160 100644
--- a/job_runner.py
+++ b/job_runner.py
@@ -59,8 +59,8 @@ def onboarding_send_from_alias(user):
     send_email(
         to_email,
         f"Do you know you can send emails from your alias?",
-        render("com/onboarding/send-from-alias.txt", user=user),
-        render("com/onboarding/send-from-alias.html", user=user),
+        render("com/onboarding/send-from-alias.txt", user=user, to_email=to_email),
+        render("com/onboarding/send-from-alias.html", user=user, to_email=to_email),
     )
 
 
@@ -72,8 +72,8 @@ def onboarding_pgp(user):
     send_email(
         to_email,
         f"Do you know you can encrypt your emails so only you can read them?",
-        render("com/onboarding/pgp.txt", user=user),
-        render("com/onboarding/pgp.html", user=user),
+        render("com/onboarding/pgp.txt", user=user, to_email=to_email),
+        render("com/onboarding/pgp.html", user=user, to_email=to_email),
     )
 
 
@@ -85,8 +85,8 @@ def onboarding_browser_extension(user):
     send_email(
         to_email,
         f"Have you tried SimpleLogin Chrome/Firefox extensions and Android/iOS apps?",
-        render("com/onboarding/browser-extension.txt", user=user),
-        render("com/onboarding/browser-extension.html", user=user),
+        render("com/onboarding/browser-extension.txt", user=user, to_email=to_email),
+        render("com/onboarding/browser-extension.html", user=user, to_email=to_email),
     )
 
 
@@ -98,8 +98,8 @@ def onboarding_mailbox(user):
     send_email(
         to_email,
         f"Do you know you can have multiple mailboxes on SimpleLogin?",
-        render("com/onboarding/mailbox.txt", user=user),
-        render("com/onboarding/mailbox.html", user=user),
+        render("com/onboarding/mailbox.txt", user=user, to_email=to_email),
+        render("com/onboarding/mailbox.html", user=user, to_email=to_email),
     )
 
 
diff --git a/templates/emails/com/onboarding/browser-extension.html b/templates/emails/com/onboarding/browser-extension.html
index 1dd6716e..3a278fd9 100644
--- a/templates/emails/com/onboarding/browser-extension.html
+++ b/templates/emails/com/onboarding/browser-extension.html
@@ -25,6 +25,6 @@
 {% endblock %}
 
 {% block footer %}
-  This email is sent to {{ user.email }} and is part of our onboarding series. Unsubscribe on
+  This email is sent to {{ to_email }} and is part of our onboarding series. Unsubscribe on
   <a href="{{ URL }}/dashboard/setting#notification">Settings</a>
 {% endblock %}
diff --git a/templates/emails/com/onboarding/browser-extension.txt b/templates/emails/com/onboarding/browser-extension.txt
index 5a5f342e..6f6874c6 100644
--- a/templates/emails/com/onboarding/browser-extension.txt
+++ b/templates/emails/com/onboarding/browser-extension.txt
@@ -1,4 +1,4 @@
-This email is sent to {{ user.email }} and is part of our onboarding series.
+This email is sent to {{ to_email }} and is part of our onboarding series.
 Unsubscribe from our emails on {{URL}}/dashboard/setting#notification
 ----------------
 
diff --git a/templates/emails/com/onboarding/mailbox.html b/templates/emails/com/onboarding/mailbox.html
index 9665d298..48c68f2b 100644
--- a/templates/emails/com/onboarding/mailbox.html
+++ b/templates/emails/com/onboarding/mailbox.html
@@ -29,6 +29,6 @@
 {% endblock %}
 
 {% block footer %}
-  This email is sent to {{ user.email }} and is part of our onboarding series. Unsubscribe on
+  This email is sent to {{ to_email }} and is part of our onboarding series. Unsubscribe on
   <a href="{{ URL }}/dashboard/setting#notification">Settings</a>
 {% endblock %}
diff --git a/templates/emails/com/onboarding/mailbox.txt b/templates/emails/com/onboarding/mailbox.txt
index 47476652..f9e8144b 100644
--- a/templates/emails/com/onboarding/mailbox.txt
+++ b/templates/emails/com/onboarding/mailbox.txt
@@ -1,4 +1,4 @@
-This email is sent to {{ user.email }} and is part of our onboarding series.
+This email is sent to {{ to_email }} and is part of our onboarding series.
 Unsubscribe from our emails on {{URL}}/dashboard/setting#notification
 ----------------
 
diff --git a/templates/emails/com/onboarding/pgp.html b/templates/emails/com/onboarding/pgp.html
index d0518450..d33ccb22 100644
--- a/templates/emails/com/onboarding/pgp.html
+++ b/templates/emails/com/onboarding/pgp.html
@@ -26,6 +26,6 @@
 {% endblock %}
 
 {% block footer %}
-  This email is sent to {{ user.email }} and is part of our onboarding series. Unsubscribe on
+  This email is sent to {{ to_email }} and is part of our onboarding series. Unsubscribe on
   <a href="{{ URL }}/dashboard/setting#notification">Settings</a>
 {% endblock %}
diff --git a/templates/emails/com/onboarding/pgp.txt b/templates/emails/com/onboarding/pgp.txt
index a1e3f027..72dbb51d 100644
--- a/templates/emails/com/onboarding/pgp.txt
+++ b/templates/emails/com/onboarding/pgp.txt
@@ -1,4 +1,4 @@
-This email is sent to {{ user.email }} and is part of our onboarding series.
+This email is sent to {{ to_email }} and is part of our onboarding series.
 Unsubscribe from our emails on {{URL}}/dashboard/setting#notification
 ----------------
 
diff --git a/templates/emails/com/onboarding/send-from-alias.html b/templates/emails/com/onboarding/send-from-alias.html
index d8728fe6..ff2ef3f6 100644
--- a/templates/emails/com/onboarding/send-from-alias.html
+++ b/templates/emails/com/onboarding/send-from-alias.html
@@ -42,6 +42,6 @@
 {% endblock %}
 
 {% block footer %}
-  This email is sent to {{ user.email }} and is part of our onboarding series. Unsubscribe on
+  This email is sent to {{ to_email }} and is part of our onboarding series. Unsubscribe on
   <a href="{{ URL }}/dashboard/setting#notification">Settings</a>
 {% endblock %}
diff --git a/templates/emails/com/onboarding/send-from-alias.txt b/templates/emails/com/onboarding/send-from-alias.txt
index 86efca78..fbbc2924 100644
--- a/templates/emails/com/onboarding/send-from-alias.txt
+++ b/templates/emails/com/onboarding/send-from-alias.txt
@@ -1,4 +1,4 @@
-This email is sent to {{ user.email }} and is part of our onboarding series.
+This email is sent to {{ to_email }} and is part of our onboarding series.
 Unsubscribe from our emails on {{URL}}/dashboard/setting#notification
 ----------------