diff --git a/dump_database.sh b/dump_database.sh
index 6aa6534..3fdceff 100755
--- a/dump_database.sh
+++ b/dump_database.sh
@@ -429,12 +429,15 @@ trap clean_up SIGHUP SIGINT SIGTERM
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
-   SYSTEMD_EXISTS=false
-else
+SYSTEMD_EXISTS=false
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 
+
 # - Running in a terminal?
 # -
 if [[ -t 1 ]] ; then
diff --git a/restore_database.sh b/restore_database.sh
index bcde8c2..390a636 100755
--- a/restore_database.sh
+++ b/restore_database.sh
@@ -428,9 +428,11 @@ trap clean_up SIGHUP SIGINT SIGTERM
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
-   SYSTEMD_EXISTS=false
-else
+SYSTEMD_EXISTS=false
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi