diff --git a/templates/email/email_assigned_production_officer.html b/templates/email/email_assigned_production_officer.html
index b6a474c49b15f6a73e33510e6dddf4481abfc841..9c40992000445bdfa411e8fa21881ed56979a4e7 100644
--- a/templates/email/email_assigned_production_officer.html
+++ b/templates/email/email_assigned_production_officer.html
@@ -1,5 +1,5 @@
 <p>
-    Dear {{ stream.invitations_officer.user.last_name }},
+    Dear {{ stream.officer.user.last_name }},
 </p>
 <p>
     You are now assigned as Production Officer to the stream
diff --git a/templates/email/email_assigned_production_officer.txt b/templates/email/email_assigned_production_officer.txt
index 60c80841b0abbf7cf207abab747e57e7d982ca80..2b102fd92a7bf6334ec60f7eaca2e4182b6e5f8a 100644
--- a/templates/email/email_assigned_production_officer.txt
+++ b/templates/email/email_assigned_production_officer.txt
@@ -1,4 +1,4 @@
-Dear {{ stream.invitations_officer.user.last_name }},
+Dear {{ stream.officer.user.last_name }},
 \n
 \n
 You are now assigned as Production Officer to the stream
diff --git a/templates/email/email_assigned_supervisor.html b/templates/email/email_assigned_supervisor.html
index c2df2ad3212a9004f4bdcceb7043bcf9e9663181..8f050acfe4f0325479c451dd7cb71d931b7c5cf5 100644
--- a/templates/email/email_assigned_supervisor.html
+++ b/templates/email/email_assigned_supervisor.html
@@ -1,5 +1,5 @@
 <p>
-    Dear {{ stream.invitations_officer.user.last_name }},
+    Dear {{ stream.supervisor.user.last_name }},
 </p>
 <p>
     You are now assigned as Production Supervisor to the stream
diff --git a/templates/email/email_assigned_supervisor.txt b/templates/email/email_assigned_supervisor.txt
index 9a4c201acb1be95a6fb7050f117ec804de4b202f..611b7b3ad42b7b05f458f5cccfdce7ab53275db9 100644
--- a/templates/email/email_assigned_supervisor.txt
+++ b/templates/email/email_assigned_supervisor.txt
@@ -1,4 +1,4 @@
-Dear {{ stream.invitations_officer.user.last_name }},
+Dear {{ stream.supervisor.user.last_name }},
 \n
 \n
 You are now assigned as Production Supervisor to the stream