diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 3a001b6ee..b7f2f42a6 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Jobs\SendAccountDeletedEmail;
 use App\Models\User;
 use Blacklight\NZBGet;
 use Blacklight\SABnzbd;
@@ -350,6 +351,7 @@ class ProfileController extends BasePageController
         if ($userId !== null && (int) $userId === $this->userdata->id && ! $this->userdata->hasRole('Admin')) {
             Auth::logout();
             $user = User::find($userId);
+            SendAccountDeletedEmail::dispatch($user)->onQueue('deleted');
             $user->delete();
         }
 
diff --git a/app/Mail/AccountChange.php b/app/Mail/AccountChange.php
index c3d91a0ef..6febb5d67 100644
--- a/app/Mail/AccountChange.php
+++ b/app/Mail/AccountChange.php
@@ -16,6 +16,16 @@ class AccountChange extends Mailable
      */
     public $user;
 
+    /**
+     * @var mixed
+     */
+    private $siteEmail;
+
+    /**
+     * @var mixed
+     */
+    private $siteTitle;
+
     /**
      * AccountChange constructor.
      *
@@ -24,6 +34,8 @@ class AccountChange extends Mailable
     public function __construct($user)
     {
         $this->user = $user;
+        $this->siteEmail = Settings::settingValue('site.main.email');
+        $this->siteTitle = Settings::settingValue('site.main.title');
     }
 
     /**
@@ -34,6 +46,6 @@ class AccountChange extends Mailable
      */
     public function build()
     {
-        return $this->from(Settings::settingValue('site.main.email'))->subject('Account Changed')->view('emails.accountChange')->with(['account' => $this->user->role->name, 'username' => $this->user->username, 'site' => Settings::settingValue('site.main.title')]);
+        return $this->from($this->siteEmail)->subject('Account Changed')->view('emails.accountChange')->with(['account' => $this->user->role->name, 'username' => $this->user->username, 'site' => $this->siteTitle]);
     }
 }
diff --git a/app/Mail/AccountDeleted.php b/app/Mail/AccountDeleted.php
index 7fdf3e557..0fc871057 100644
--- a/app/Mail/AccountDeleted.php
+++ b/app/Mail/AccountDeleted.php
@@ -17,6 +17,16 @@ class AccountDeleted extends Mailable
      */
     private $user;
 
+    /**
+     * @var mixed
+     */
+    private $siteEmail;
+
+    /**
+     * @var mixed
+     */
+    private $siteTitle;
+
     /**
      * Create a new message instance.
      *
@@ -25,6 +35,8 @@ class AccountDeleted extends Mailable
     public function __construct($user)
     {
         $this->user = $user;
+        $this->siteEmail = Settings::settingValue('site.main.email');
+        $this->siteTitle = Settings::settingValue('site.main.title');
     }
 
     /**
@@ -33,6 +45,6 @@ class AccountDeleted extends Mailable
      */
     public function build()
     {
-        return $this->from(Settings::settingValue('site.main.email'))->subject('User Account Deleted')->view('emails.accountDelete')->with(['username' => $this->user->username, 'site' => Settings::settingValue('site.main.title')]);
+        return $this->from($this->siteEmail)->subject('User Account Deleted')->view('emails.accountDelete')->with(['username' => $this->user->username, 'site' => $this->siteTitle]);
     }
 }
diff --git a/app/Mail/AccountExpired.php b/app/Mail/AccountExpired.php
index 5eaea5d61..343f146d2 100644
--- a/app/Mail/AccountExpired.php
+++ b/app/Mail/AccountExpired.php
@@ -12,6 +12,8 @@ class AccountExpired extends Mailable
     use Queueable, SerializesModels;
 
     public $user;
+    private $siteEmail;
+    private $siteTitle;
 
     /**
      * Create a new message instance.
@@ -21,6 +23,8 @@ class AccountExpired extends Mailable
     public function __construct($user)
     {
         $this->user = $user;
+        $this->siteEmail = Settings::settingValue('site.main.email');
+        $this->siteTitle = Settings::settingValue('site.main.title');
     }
 
     /**
@@ -31,6 +35,6 @@ class AccountExpired extends Mailable
      */
     public function build()
     {
-        return $this->from(Settings::settingValue('site.main.email'))->subject('Account expired')->view('emails.accountExpired')->with(['account' => $this->user->role->name, 'username' => $this->user->username, 'site' => Settings::settingValue('site.main.title')]);
+        return $this->from($this->siteEmail)->subject('Account expired')->view('emails.accountExpired')->with(['account' => $this->user->role->name, 'username' => $this->user->username, 'site' => $this->siteTitle]);
     }
 }
diff --git a/app/Mail/AccountWillExpire.php b/app/Mail/AccountWillExpire.php
index 8dad2c419..b1e1189c0 100644
--- a/app/Mail/AccountWillExpire.php
+++ b/app/Mail/AccountWillExpire.php
@@ -15,6 +15,16 @@ class AccountWillExpire extends Mailable
 
     private $user;
 
+    /**
+     * @var mixed
+     */
+    private $siteEmail;
+
+    /**
+     * @var mixed
+     */
+    private $siteTitle;
+
     /**
      * Create a new message instance.
      *
@@ -24,6 +34,8 @@ class AccountWillExpire extends Mailable
     {
         $this->user = $user;
         $this->days = $days;
+        $this->siteEmail = Settings::settingValue('site.main.email');
+        $this->siteTitle = Settings::settingValue('site.main.title');
     }
 
     /**
@@ -33,6 +45,6 @@ class AccountWillExpire extends Mailable
      */
     public function build()
     {
-        return $this->from(Settings::settingValue('site.main.email'))->subject('Account about to expire')->view('emails.accountAboutToExpire')->with(['account' => $this->user->role->name, 'username' => $this->user->username, 'site' => Settings::settingValue('site.main.title'), 'days' => $this->days]);
+        return $this->from($this->siteEmail)->subject('Account about to expire')->view('emails.accountAboutToExpire')->with(['account' => $this->user->role->name, 'username' => $this->user->username, 'site' => $this->siteTitle, 'days' => $this->days]);
     }
 }
diff --git a/app/Mail/ForgottenPassword.php b/app/Mail/ForgottenPassword.php
index 77a222549..668418223 100644
--- a/app/Mail/ForgottenPassword.php
+++ b/app/Mail/ForgottenPassword.php
@@ -15,6 +15,16 @@ class ForgottenPassword extends Mailable
 
     public $resetLink;
 
+    /**
+     * @var mixed
+     */
+    private $siteEmail;
+
+    /**
+     * @var mixed
+     */
+    private $siteTitle;
+
     /**
      * Create a new message instance.
      *
@@ -23,6 +33,8 @@ class ForgottenPassword extends Mailable
     public function __construct($resetLink)
     {
         $this->resetLink = $resetLink;
+        $this->siteEmail = Settings::settingValue('site.main.email');
+        $this->siteTitle = Settings::settingValue('site.main.title');
     }
 
     /**
@@ -33,6 +45,6 @@ class ForgottenPassword extends Mailable
      */
     public function build()
     {
-        return $this->from(Settings::settingValue('site.main.email'))->subject('Forgotten password reset')->view('emails.forgottenPassword')->with(['resetLink' => $this->resetLink, 'site' => Settings::settingValue('site.main.title')]);
+        return $this->from($this->siteEmail)->subject('Forgotten password reset')->view('emails.forgottenPassword')->with(['resetLink' => $this->resetLink, 'site' => $this->siteTitle]);
     }
 }
diff --git a/app/Mail/NewAccountCreatedEmail.php b/app/Mail/NewAccountCreatedEmail.php
index 26353243c..32a8147ab 100644
--- a/app/Mail/NewAccountCreatedEmail.php
+++ b/app/Mail/NewAccountCreatedEmail.php
@@ -16,6 +16,16 @@ class NewAccountCreatedEmail extends Mailable
      */
     private $user;
 
+    /**
+     * @var mixed
+     */
+    private $siteEmail;
+
+    /**
+     * @var mixed
+     */
+    private $siteTitle;
+
     /**
      * Create a new message instance.
      *
@@ -24,6 +34,8 @@ class NewAccountCreatedEmail extends Mailable
     public function __construct($user)
     {
         $this->user = $user;
+        $this->siteEmail = Settings::settingValue('site.main.email');
+        $this->siteTitle = Settings::settingValue('site.main.title');
     }
 
     /**
@@ -33,6 +45,6 @@ class NewAccountCreatedEmail extends Mailable
      */
     public function build()
     {
-        return $this->from(Settings::settingValue('site.main.email'))->subject('New account registered')->view('emails.newAccountCreated')->with(['username' => $this->user->username, 'site' => Settings::settingValue('site.main.title')]);
+        return $this->from($this->siteEmail)->subject('New account registered')->view('emails.newAccountCreated')->with(['username' => $this->user->username, 'site' => $this->siteTitle]);
     }
 }
diff --git a/app/Mail/PasswordReset.php b/app/Mail/PasswordReset.php
index 211628487..ccf5f158d 100644
--- a/app/Mail/PasswordReset.php
+++ b/app/Mail/PasswordReset.php
@@ -21,6 +21,16 @@ class PasswordReset extends Mailable
      */
     private $newPass;
 
+    /**
+     * @var mixed
+     */
+    private $siteEmail;
+
+    /**
+     * @var mixed
+     */
+    private $siteTitle;
+
     /**
      * PasswordReset constructor.
      *
@@ -31,6 +41,8 @@ class PasswordReset extends Mailable
     {
         $this->user = $user;
         $this->newPass = $newPass;
+        $this->siteEmail = Settings::settingValue('site.main.email');
+        $this->siteTitle = Settings::settingValue('site.main.title');
     }
 
     /**
@@ -41,6 +53,6 @@ class PasswordReset extends Mailable
      */
     public function build()
     {
-        return $this->from(Settings::settingValue('site.main.email'))->subject('Password reset')->view('emails.passwordReset')->with(['newPass' => $this->newPass, 'userName' => $this->user->username, 'site' => Settings::settingValue('site.main.title')]);
+        return $this->from($this->siteEmail)->subject('Password reset')->view('emails.passwordReset')->with(['newPass' => $this->newPass, 'userName' => $this->user->username, 'site' => $this->siteTitle]);
     }
 }
diff --git a/app/Mail/SendInvite.php b/app/Mail/SendInvite.php
index a0c2a74a6..baf0e814a 100644
--- a/app/Mail/SendInvite.php
+++ b/app/Mail/SendInvite.php
@@ -21,6 +21,16 @@ class SendInvite extends Mailable
      */
     public $invite;
 
+    /**
+     * @var mixed
+     */
+    private $siteEmail;
+
+    /**
+     * @var mixed
+     */
+    private $siteTitle;
+
     /**
      * SendInvite constructor.
      *
@@ -31,6 +41,8 @@ class SendInvite extends Mailable
     {
         $this->user = $user;
         $this->invite = $invite;
+        $this->siteEmail = Settings::settingValue('site.main.email');
+        $this->siteTitle = Settings::settingValue('site.main.title');
     }
 
     /**
@@ -41,6 +53,6 @@ class SendInvite extends Mailable
      */
     public function build()
     {
-        return $this->from(Settings::settingValue('site.main.email'))->subject('Invite received')->view('emails.sendinvite')->with(['invite' => $this->invite, 'username' => $this->user['username'], 'site' => Settings::settingValue('site.main.title'), 'email' => $this->user['email']]);
+        return $this->from($this->siteEmail)->subject('Invite received')->view('emails.sendinvite')->with(['invite' => $this->invite, 'username' => $this->user['username'], 'site' => $this->siteTitle, 'email' => $this->user['email']]);
     }
 }
diff --git a/app/Mail/WelcomeEmail.php b/app/Mail/WelcomeEmail.php
index b17ea66ad..39164ea43 100644
--- a/app/Mail/WelcomeEmail.php
+++ b/app/Mail/WelcomeEmail.php
@@ -16,6 +16,16 @@ class WelcomeEmail extends Mailable
      */
     private $user;
 
+    /**
+     * @var mixed
+     */
+    private $siteEmail;
+
+    /**
+     * @var mixed
+     */
+    private $siteTitle;
+
     /**
      * Create a new message instance.
      *
@@ -24,6 +34,8 @@ class WelcomeEmail extends Mailable
     public function __construct($user)
     {
         $this->user = $user;
+        $this->siteEmail = Settings::settingValue('site.main.email');
+        $this->siteTitle = Settings::settingValue('site.main.title');
     }
 
     /**
@@ -33,6 +45,6 @@ class WelcomeEmail extends Mailable
      */
     public function build()
     {
-        return $this->from(Settings::settingValue('site.main.email'))->subject('Welcome to '.Settings::settingValue('site.main.title'))->view('emails.welcome')->with(['username' => $this->user->username, 'site' => Settings::settingValue('site.main.title')]);
+        return $this->from($this->siteEmail)->subject('Welcome to '.$this->siteTitle)->view('emails.welcome')->with(['username' => $this->user->username, 'site' => $this->siteTitle]);
     }
 }
diff --git a/app/Observers/UserServiceObserver.php b/app/Observers/UserServiceObserver.php
index 46f3e2d11..d1c45ffee 100644
--- a/app/Observers/UserServiceObserver.php
+++ b/app/Observers/UserServiceObserver.php
@@ -44,12 +44,4 @@ class UserServiceObserver
             UserVerification::send($user, 'User email verification required', Settings::settingValue('site.main.email'));
         }
     }
-
-    /**
-     * @param \App\Models\User $user
-     */
-    public function deleting(User $user)
-    {
-        SendAccountDeletedEmail::dispatch($user)->onQueue('deleted');
-    }
 }