diff --git a/src/service/mailer/mod.rs b/src/service/mailer/mod.rs
index 8dedfb63f..9d7ad409d 100644
--- a/src/service/mailer/mod.rs
+++ b/src/service/mailer/mod.rs
@@ -67,8 +67,9 @@ impl Service {
 	}
 
 	pub fn expect_mailer(&self) -> Result<Mailer<'_>> {
-		self.mailer()
-			.ok_or_else(|| err!("SMTP is not configured on this server"))
+		self.mailer().ok_or_else(|| {
+			err!(Request(FeatureDisabled("This homeserver is not configured to send email.")))
+		})
 	}
 }