diff --git a/ui/src/main/resources/XWiki/AccountRejectionTemplate.xml b/ui/src/main/resources/XWiki/AccountRejectionTemplate.xml
index 97d8b4b1..d6fea385 100644
--- a/ui/src/main/resources/XWiki/AccountRejectionTemplate.xml
+++ b/ui/src/main/resources/XWiki/AccountRejectionTemplate.xml
@@ -107,7 +107,7 @@ ${platformName} Support Team</p>
       <language/>
     </property>
     <property>
-      <subject>PhenomeCentral account status</subject>
+      <subject>${platformName} account status</subject>
     </property>
     <property>
       <text>Dear ${userRealName},
diff --git a/ui/src/main/resources/XWiki/ManualAccountValidation.xml b/ui/src/main/resources/XWiki/ManualAccountValidation.xml
index 77ac45db..a018f27c 100644
--- a/ui/src/main/resources/XWiki/ManualAccountValidation.xml
+++ b/ui/src/main/resources/XWiki/ManualAccountValidation.xml
@@ -93,15 +93,12 @@
     #set ($emailStatus = 0)
   #end
 
-  #if ("$!{request.action}" == 'accept')
-    $user.set('active', 1)
-  #elseif("$!{request.action}" == 'reject')
-    $userDoc.delete()
-  #end
-
   #if ($emailStatus == 0)
     #if ("$!{request.action}" == 'accept')
+      $user.set('active', 1)
       $userDoc.save()
+    #elseif("$!{request.action}" == 'reject')
+      $userDoc.delete()
     #end
 true
   #else
@@ -188,7 +185,7 @@ ${platformName} Team&lt;/p&gt;
       <language/>
     </property>
     <property>
-      <subject>Your account at PhenomeCentral has been approved</subject>
+      <subject>Your account at ${platformName} has been approved</subject>
     </property>
     <property>
       <text>Dear ${userRealName},