diff --git a/scripting/bin/administration/diagnostics.py b/scripting/bin/administration/diagnostics.py
index 4e45f3fecf74aa75778668f5cc19c43dc634ba35..3c47a65dd81ac347ff02891130e3dfc0c4a975da 100755
--- a/scripting/bin/administration/diagnostics.py
+++ b/scripting/bin/administration/diagnostics.py
@@ -127,9 +127,10 @@ def test_send_mail():
     result = dict()
     import caosdb
     from caosadvancedtools.serverside import helper
-    result["sendmail_bin"] = caosdb.get_config()["Misc"]["sendmail"]
     test_mail_to = get_option("test-mail-to")
     test_mail_from = get_option("test-mail-from")
+    result["sendmail_bin"] = get_option("test-sendmail-bin",
+                                        caosdb.get_config()["Misc"]["sendmail"])
     if test_mail_to is not None and test_mail_from is not None:
         helper.send_mail(from_addr=test_mail_from,
                          to=test_mail_to,