diff --git a/server/adminmailer.sh b/server/adminmailer.sh
index f2a9048..f4a6e8c 100755
--- a/server/adminmailer.sh
+++ b/server/adminmailer.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+if [ $SERVICE_RESULT == "success" ]; then
+	exit
+fi
+
 /home/hmn/hmn/adminmailer/adminmailer "[$1] Status changed" <<ERRMAIL
 $(service "$1" status)
 ERRMAIL
diff --git a/server/caddy.service b/server/caddy.service
index f0ea012..8244dc5 100644
--- a/server/caddy.service
+++ b/server/caddy.service
@@ -28,7 +28,7 @@ LimitNPROC=512
 PrivateTmp=true
 ProtectSystem=full
 AmbientCapabilities=CAP_NET_BIND_SERVICE
-OnFailure=status-email@%n.service
+ExecStopPost=status-email@%n.service
 
 [Install]
 WantedBy=multi-user.target
diff --git a/server/cinera.service b/server/cinera.service
index 0282f76..c7cb839 100644
--- a/server/cinera.service
+++ b/server/cinera.service
@@ -10,7 +10,7 @@ ExecStart=/home/hmn/hmn/cinera/start.sh
 ExecStop=/home/hmn/hmn/cinera/stop.sh
 PIDFile=/home/hmn/hmn/cinera/data/cinera.pid
 Restart=always
-OnFailure=status-email@%n.service
+ExecStopPost=status-email@%n.service
 
 [Install]
 WantedBy=multi-user.target
diff --git a/server/hmn.service b/server/hmn.service
index 50ad401..d36e778 100644
--- a/server/hmn.service
+++ b/server/hmn.service
@@ -8,7 +8,7 @@ Group=hmn
 ExecStart=/home/hmn/bin/hmn
 Restart=always
 TimeoutStopSec=15
-OnFailure=status-email@%n.service
+ExecStopPost=status-email@%n.service
 
 [Install]
 WantedBy=multi-user.target