diff --git a/lang/en.yml b/lang/en.yml
index 1530e5a12..1fae6ffdb 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -1,6 +1,4 @@
 en:
-  DataObject:
-    php.SilverStripe\ORM\DataObjectGENERALSEARCH: 'General Search'
   SilverStripe\AssetAdmin\Forms\UploadField:
     Dimensions: Dimensions
     EDIT: Edit
diff --git a/lang/eo.yml b/lang/eo.yml
index f16f2c9ca..90a62785c 100644
--- a/lang/eo.yml
+++ b/lang/eo.yml
@@ -370,6 +370,3 @@ eo:
     PASSWORDRESETSENTTEXT: 'Dankon. Reagorda ligilo sendiĝis, kondiĉe ke konto ekzistas por ĉi tiu retadreso.'
   SilverStripe\View\Shortcodes\EmbedShortcodeProvider:
     INVALID_URL: 'Okazis problemo ŝargi la aŭdvidaĵon.'
-  DataObject:
-    php:
-      SilverStripe\ORM\DataObjectGENERALSEARCH: 'Ĝenerala serĉo'
diff --git a/lang/nl.yml b/lang/nl.yml
index 1c65dced9..236f9ac51 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -370,6 +370,3 @@ nl:
     PASSWORDRESETSENTTEXT: 'Bedankt! Er is een e-mail verstuurd om je wachtwoord opnieuw in te stellen - mits het e-mailadres reeds bekend is bij ons.'
   SilverStripe\View\Shortcodes\EmbedShortcodeProvider:
     INVALID_URL: 'Het inladen van de media-bestanden is mislukt.'
-  DataObject:
-    php:
-      SilverStripe\ORM\DataObjectGENERALSEARCH: 'Alles doorzoeken'
diff --git a/src/ORM/DataObject.php b/src/ORM/DataObject.php
index fae101fd3..25e8c345b 100644
--- a/src/ORM/DataObject.php
+++ b/src/ORM/DataObject.php
@@ -2433,7 +2433,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
             if ($fields->fieldByName($generalSearch) || $fields->dataFieldByName($generalSearch)) {
                 throw new LogicException('General search field name must be unique.');
             }
-            $fields->unshift(HiddenField::create($generalSearch, _t(self::class . 'GENERALSEARCH', 'General Search')));
+            $fields->unshift(HiddenField::create($generalSearch, _t(self::class . '.GENERALSEARCH', 'General Search')));
         }
 
         return $fields;
diff --git a/src/Security/Member.php b/src/Security/Member.php
index 2d388fc1f..c6240b9a6 100644
--- a/src/Security/Member.php
+++ b/src/Security/Member.php
@@ -774,7 +774,7 @@ class Member extends DataObject
         if ((Director::isLive() || Injector::inst()->get(MailerInterface::class) instanceof TestMailer)
             && $this->isChanged('Password')
             && $this->record['Password']
-            && $this->Email
+            && Email::is_valid_address($this->Email ?? '')
             && static::config()->get('notify_password_change')
             && $this->isInDB()
         ) {