diff --git a/doc/6-configuring-icinga-2.md b/doc/6-configuring-icinga-2.md
index 5dfdb0dfd..bc7bf0d6f 100644
--- a/doc/6-configuring-icinga-2.md
+++ b/doc/6-configuring-icinga-2.md
@@ -1881,6 +1881,7 @@ Custom Attributes:
Name | Description
---------------------|--------------
smtp_address | **Optional.** The host's address. Defaults to "$address$".
+smtp_mail_from | **Optional.** Test a MAIL FROM command with the given email address.
#### ssmtp
@@ -1892,6 +1893,7 @@ Name | Description
----------------|--------------
ssmtp_address | **Required.** The host's address. Defaults to "$address$".
ssmtp_port | **Optional.** The port that should be checked. Defaults to 465.
+ssmtp_mail_from | **Optional.** Test a MAIL FROM command with the given email address.
#### imap
diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index 0aca02e24..777ab0b85 100644
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -152,6 +152,7 @@ object CheckCommand "smtp" {
arguments = {
"-H" = "$smtp_address$"
+ "-f" = "$smtp_mail_from$"
}
vars.smtp_address = "$address$"
@@ -165,6 +166,7 @@ object CheckCommand "ssmtp" {
arguments = {
"-H" = "$ssmtp_address$"
"-p" = "$ssmtp_port$"
+ "-f" = "$ssmtp_mail_from$"
}
vars.ssmtp_address = "$address$"