diff --git a/src/Dev/TestMailer.php b/src/Dev/TestMailer.php
index 8c949e296..3d37b0ded 100644
--- a/src/Dev/TestMailer.php
+++ b/src/Dev/TestMailer.php
@@ -103,17 +103,18 @@ class TestMailer implements Mailer
         foreach ($this->emailsSent as $email) {
             $matched = true;
 
-            foreach (['To', 'From', 'Subject', 'Content'] as $field) {
+            // Loop all our Email fields
+            foreach ($compare as $field => $value) {
                 $emailValue = $email[$field];
-                if ($value = $compare[$field]) {
-                    if ($field == 'To') {
+                if ($value) {
+                    if (in_array($field, ['To', 'From'])) {
                         $emailValue = $this->normaliseSpaces($emailValue);
                         $value = $this->normaliseSpaces($value);
                     }
-                    if ($value[0] == '/') {
+                    if ($value[0] === '/') {
                         $matched = preg_match($value, $emailValue);
                     } else {
-                        $matched = ($value == $emailValue);
+                        $matched = ($value === $emailValue);
                     }
                     if (!$matched) {
                         break;
diff --git a/src/Security/Member.php b/src/Security/Member.php
index c88ea357d..7150507e8 100644
--- a/src/Security/Member.php
+++ b/src/Security/Member.php
@@ -910,6 +910,7 @@ class Member extends DataObject
         if ((Director::isLive() || Injector::inst()->get(Mailer::class) instanceof TestMailer)
             && $this->isChanged('Password')
             && $this->record['Password']
+            && $this->Email
             && static::config()->get('notify_password_change')
             && $this->isInDB()
         ) {