diff --git a/security/Member.php b/security/Member.php
index 0a0074477..4d494aca2 100644
--- a/security/Member.php
+++ b/security/Member.php
@@ -478,6 +478,8 @@ class Member extends DataObject implements TemplateGlobalProvider {
 	 * @param array $data Additional data to pass to the email (can be used in the template)
 	 */
 	function sendInfo($type = 'signup', $data = null) {
+		Deprecation::notice('3.0', 'Please use Member_ChangePasswordEmail or Member_ForgotPasswordEmail directly instead');
+
 		switch($type) {
 			case "changePassword":
 				$e = Member_ChangePasswordEmail::create();
@@ -644,7 +646,10 @@ class Member extends DataObject implements TemplateGlobalProvider {
 			&& $this->record['Password'] 
 			&& Member::$notify_password_change
 		) {
-			$this->sendInfo('changePassword');
+			$e = Member_ChangePasswordEmail::create();
+			$e->populateTemplate($this);
+			$e->setTo($this->Email);
+			$e->send();
 		}
 
 		// The test on $this->ID is used for when records are initially created.
diff --git a/security/MemberLoginForm.php b/security/MemberLoginForm.php
index 538824453..6da3d6948 100644
--- a/security/MemberLoginForm.php
+++ b/security/MemberLoginForm.php
@@ -258,12 +258,13 @@ JS
 		if($member) {
 			$member->generateAutologinHash();
 
-			$member->sendInfo(
-				'forgotPassword',
-				array(
-					'PasswordResetLink' => Security::getPasswordResetLink($member->AutoLoginHash)
-				)
-			);
+			$e = Member_ForgotPasswordEmail::create();
+			$e->populateTemplate($member);
+			$e->populateTemplate(array(
+				'PasswordResetLink' => Security::getPasswordResetLink($member->AutoLoginHash)
+			));
+			$e->setTo($member->Email);
+			$e->send();
 
 			$this->controller->redirect('Security/passwordsent/' . urlencode($data['Email']));
 		} elseif($data['Email']) {