diff --git a/mal.d b/mal.d
index 43cbe68..70e6dec 100644
--- a/mal.d
+++ b/mal.d
@@ -152,7 +152,8 @@ main(string[] args)
 		addr = "<" ~ addr ~ ">";
 	}
 
-	authUser = authUser ? authUser : fromStatus.localPart;
+	/* https://todo.sr.ht/~jeremy/mal/2 */
+	authUser = authUser ? authUser : fromAddr;
 	protocol = useSmtps ? "smtps" : "smtp";
 	serverAddr = serverAddr ? serverAddr : fromStatus.domainPart;
 	serverPort = serverPort ? serverPort : useSmtps ? "465" : "587";