diff --git a/RIGS/templates/RIGS/eventauthorisation_client_success.html b/RIGS/templates/RIGS/eventauthorisation_client_success.html
index dc6d0485..398dee80 100644
--- a/RIGS/templates/RIGS/eventauthorisation_client_success.html
+++ b/RIGS/templates/RIGS/eventauthorisation_client_success.html
@@ -6,7 +6,7 @@
     <p>
         Your event <b>N{{ object.event.pk|stringformat:"05d" }}</b> has been successfully authorised
         for <b>&pound;{{ object.amount }}</b>
-        by <b>{{ object.name }}</b> as of <b>{{ object.last_edited_at }}</b>.
+        by <b>{{ object.name }}</b> as of <b>{{ object.event.last_edited_at }}</b>.
     </p>
 
     <p>
diff --git a/RIGS/templates/RIGS/eventauthorisation_client_success.txt b/RIGS/templates/RIGS/eventauthorisation_client_success.txt
index 2914b045..c511fc72 100644
--- a/RIGS/templates/RIGS/eventauthorisation_client_success.txt
+++ b/RIGS/templates/RIGS/eventauthorisation_client_success.txt
@@ -1,4 +1,4 @@
-Hi {{ to_name|default:"there" }},
+Hi {{ to_name|default_if_none:"there" }},
 
 Your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.event.last_edited_at}}.