diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index e0e8e51df..68aaf808f 100644
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -279,7 +279,7 @@ sub formbuilder (@) { #{{{
 				error($@) if $@;
 				sendmail(
 					To => IkiWiki::userinfo_get($user_name, "email"),
-					From => "$config{wikiname} admin <$config{adminemail}>",
+					From => "$config{wikiname} admin <".(defined $config{adminemail} ? $config{adminemail} : "")>",
 					Subject => "$config{wikiname} information",
 					Message => $template->output,
 				) or error(gettext("Failed to send mail"));