diff --git a/src/freedombone-app-bdsmail b/src/freedombone-app-bdsmail
index 1967d531..99a26025 100755
--- a/src/freedombone-app-bdsmail
+++ b/src/freedombone-app-bdsmail
@@ -239,7 +239,7 @@ function install_bdsmail {
     echo 'WantedBy=multi-user.target' >> /etc/systemd/system/bdsmail.service
     systemctl enable bdsmail
     chown -R bdsmail:bdsmail /etc/bdsmail
-    systemctl restart bdsmail
+    systemctl start bdsmail
 
     echo '#!/usr/bin/env python2' > /etc/bdsmail/get_address
     echo 'import base64, hashlib, sys' >> /etc/bdsmail/get_address
@@ -257,10 +257,14 @@ function install_bdsmail {
     sleep 15
     bds_domain=$(bdsmail_domain)
     if [ ! $bds_domain ]; then
+        echo $'Waiting...'
         sleep 15
         bds_domain=$(bdsmail_domain)
         if [ ! $bds_domain ]; then
             echo $'Failed to get the bdsmail domain'
+            systemctl stop bdsmail
+            systemctl disable bdsmail
+            remove_i2p
             exit 8934638
         fi
     fi