diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 5384dc0cb25..0fa95023517 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -522,7 +522,7 @@ the user from the mailer."
 	    ;; they put one in themselves.
 	    (goto-char (point-min))
 	    (if (not (re-search-forward "^From:" delimline t))
-		(let* ((login (user-login-name))
+		(let* ((login user-mail-address)
 		       (fullname (user-full-name)))
 		  (cond ((eq mail-from-style 'angles)
 			 (insert "From: " fullname)