diff --git a/public/include/classes/mail.class.php b/public/include/classes/mail.class.php
index 04f0368a..aeb4659c 100644
--- a/public/include/classes/mail.class.php
+++ b/public/include/classes/mail.class.php
@@ -62,7 +62,7 @@ class Mail extends Base {
     $this->smarty->assign('WEBSITENAME', $this->setting->getValue('website_name'));
     $this->smarty->assign('SUBJECT', $aData['subject']);
     $this->smarty->assign('DATA', $aData);
-    $headers = 'From: Website Administration <' . $this->setting->getValue('website_email') . ">\n";
+    $headers = 'From: {$GLOBAL.website.name|default:"Unknown Pool"} <' . $this->setting->getValue('website_email') . ">\n";
     $headers .= "MIME-Version: 1.0\n";
     $headers .= "Content-Type: text/html; charset=ISO-8859-1\r\n";
     if (strlen(@$aData['senderName']) > 0 && @strlen($aData['senderEmail']) > 0 )
diff --git a/public/templates/mail/invitations/body.tpl b/public/templates/mail/invitations/body.tpl
index 17294318..2f80f05a 100644
--- a/public/templates/mail/invitations/body.tpl
+++ b/public/templates/mail/invitations/body.tpl
@@ -6,6 +6,6 @@
 {if $DATA.message}<p>Personal message:</p><p>{nocache}{$DATA.message}{/nocache}</p>{/if}
 <p></p>
 <p>Cheers,</p>
-<p>Website Administration</p>
+<p>{$GLOBAL.website.name|default:"Unknown Pool"}</p>
 </body>
 </html>
diff --git a/public/templates/mail/password/reset.tpl b/public/templates/mail/password/reset.tpl
index 77493939..f5d9f8d8 100644
--- a/public/templates/mail/password/reset.tpl
+++ b/public/templates/mail/password/reset.tpl
@@ -5,6 +5,6 @@
 <p>http://{$smarty.server.SERVER_NAME}{$smarty.server.SCRIPT_NAME}?page=password&action=change&token={nocache}{$DATA.token}{/nocache}</p>
 <p>You will be asked to change your password. You can then use this new password to login to your account.</p>
 <p>Cheers,</p>
-<p>Website Administration</p>
+<p>{$GLOBAL.website.name|default:"Unknown Pool"}</p>
 </body>
 </html>
diff --git a/public/templates/mail/pin/reset.tpl b/public/templates/mail/pin/reset.tpl
index b7b0d5f1..0c669eb6 100644
--- a/public/templates/mail/pin/reset.tpl
+++ b/public/templates/mail/pin/reset.tpl
@@ -4,6 +4,6 @@
 <p>You have requested a PIN reset through our online form.</p>
 <p>Randomly Generated PIN: {$DATA.pin}</p>
 <p>Cheers,</p>
-<p>Website Administration</p>
+<p>{$GLOBAL.website.name|default:"Unknown Pool"}</p>
 </body>
 </html>
diff --git a/public/templates/mail/register/confirm_email.tpl b/public/templates/mail/register/confirm_email.tpl
index 962793c0..e07d0e71 100644
--- a/public/templates/mail/register/confirm_email.tpl
+++ b/public/templates/mail/register/confirm_email.tpl
@@ -5,6 +5,6 @@
 <p>http://{$smarty.server.SERVER_NAME}{$smarty.server.SCRIPT_NAME}?page=account&action=confirm&token={nocache}{$DATA.token}{/nocache}</p>
 <p></p>
 <p>Cheers,</p>
-<p>Website Administration</p>
+<p>{$GLOBAL.website.name|default:"Unknown Pool"}</p>
 </body>
 </html>