diff --git a/security/Member.php b/security/Member.php
index 5ffed1e4d..17cc5f589 100644
--- a/security/Member.php
+++ b/security/Member.php
@@ -450,7 +450,10 @@ class Member extends DataObject {
 			}
 		}
 
-		if($this->changed['Password'] && Member::$notify_password_change) $this->sendInfo('changePassword');
+		if(Director::isLive() &&
+			$this->ID &&
+			$this->changed['Password'] && 
+			Member::$notify_password_change) $this->sendInfo('changePassword');
 		
 		parent::onBeforeWrite();
 	}