diff --git a/app/Mail/EmailChange.php b/app/Mail/EmailChange.php
new file mode 100644
index 000000000..0a3934fd8
--- /dev/null
+++ b/app/Mail/EmailChange.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Contracts\Queue\ShouldQueue;
+
+class EmailChange extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        return $this->markdown('emails.notification.email_change');
+    }
+}
diff --git a/app/Mail/PasswordChange.php b/app/Mail/PasswordChange.php
new file mode 100644
index 000000000..f90c10b51
--- /dev/null
+++ b/app/Mail/PasswordChange.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Contracts\Queue\ShouldQueue;
+
+class PasswordChange extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        return $this->markdown('emails.notification.password_change');
+    }
+}
diff --git a/resources/views/emails/confirm_email.blade.php b/resources/views/emails/confirm_email.blade.php
index 20d388b96..cb521c9b9 100644
--- a/resources/views/emails/confirm_email.blade.php
+++ b/resources/views/emails/confirm_email.blade.php
@@ -8,5 +8,5 @@ Confirm Email
 @endcomponent
 
 Thanks,<br>
-{{ config('app.name') }}
+{{ config('pixelfed.domain.app') }}
 @endcomponent
diff --git a/resources/views/emails/notification/email_change.blade.php b/resources/views/emails/notification/email_change.blade.php
new file mode 100644
index 000000000..0a9cc0914
--- /dev/null
+++ b/resources/views/emails/notification/email_change.blade.php
@@ -0,0 +1,15 @@
+@component('mail::message')
+# Account Email Changed
+
+
+@component('mail::panel')
+<p>The email associated to your account has been changed.</p>
+@endcomponent
+
+<small>If you did not make this change and believe your Pixelfed account has been compromised, please contact the instance admin.</small>
+
+<br>
+
+Thanks,<br>
+{{ config('pixelfed.domain.app') }}
+@endcomponent
diff --git a/resources/views/emails/notification/password_change.blade.php b/resources/views/emails/notification/password_change.blade.php
new file mode 100644
index 000000000..1ff616e41
--- /dev/null
+++ b/resources/views/emails/notification/password_change.blade.php
@@ -0,0 +1,15 @@
+@component('mail::message')
+# Account Password Changed
+
+
+@component('mail::panel')
+<p>The password for your account has been changed.</p>
+@endcomponent
+
+<small>If you did not make this change and believe your Pixelfed account has been compromised, please change your password immediately or contact the instance admin if you're locked out of your account.</small>
+
+<br>
+
+Thanks,<br>
+{{ config('pixelfed.domain.app') }}
+@endcomponent