diff --git a/webmail/webmail.js b/webmail/webmail.js
index 9bd0d3a..96b6e42 100644
--- a/webmail/webmail.js
+++ b/webmail/webmail.js
@@ -2928,7 +2928,7 @@ const compose = (opts, listMailboxes) => {
 		return accountAddresses.find(a => a.Domain.ASCII === addr.Domain.ASCII && (a.User === '' || normalizeUser(a) === normalizeUser(addr)));
 	};
 	let haveFrom = false;
-	const fromOptions = accountAddresses.map(a => {
+	const fromOptions = accountAddresses.filter(a => a.User).map(a => {
 		const selected = opts.from && opts.from.length === 1 && equalAddress(a, opts.from[0]) || loginAddress && equalAddress(a, loginAddress) && (!opts.from || envelopeIdentity(opts.from));
 		const o = dom.option(formatAddress(a), selected ? attr.selected('') : []);
 		if (selected) {
diff --git a/webmail/webmail.ts b/webmail/webmail.ts
index 1efb488..bb50bcf 100644
--- a/webmail/webmail.ts
+++ b/webmail/webmail.ts
@@ -1860,7 +1860,7 @@ const compose = (opts: ComposeOptions, listMailboxes: listMailboxes) => {
 	}
 
 	let haveFrom = false
-	const fromOptions = accountAddresses.map(a => {
+	const fromOptions = accountAddresses.filter(a => a.User).map(a => {
 		const selected = opts.from && opts.from.length === 1 && equalAddress(a, opts.from[0]) || loginAddress && equalAddress(a, loginAddress) && (!opts.from || envelopeIdentity(opts.from))
 		const o = dom.option(formatAddress(a), selected ? attr.selected('') : [])
 		if (selected) {