diff --git a/data/Dockerfiles/watchdog/watchdog.sh b/data/Dockerfiles/watchdog/watchdog.sh
index 5079bd57..a9392684 100755
--- a/data/Dockerfiles/watchdog/watchdog.sh
+++ b/data/Dockerfiles/watchdog/watchdog.sh
@@ -479,6 +479,7 @@ acme_checks() {
     ACME_LC=0
     until [[ ! -z ${ACME_LOG_STATUS} ]] || [ ${ACME_LC} -ge 3 ]; do
       ACME_LOG_STATUS=$(redis-cli -h redis GET ACME_FAIL_TIME 2> /dev/null)
+      sleep 3
       ACME_LC=$((ACME_LC+1))
     done
     if [[ ${ACME_LOG_STATUS_PREV} != ${ACME_LOG_STATUS} ]]; then
diff --git a/data/web/lang/lang.ca.json b/data/web/lang/lang.ca.json
index d4027d81..be18fa27 100644
--- a/data/web/lang/lang.ca.json
+++ b/data/web/lang/lang.ca.json
@@ -460,7 +460,7 @@
         "select_domain": "Si et plau, primer selecciona un domini",
         "password": "Constrasenya:",
         "password_repeat": "Confirmació de contrasenya (repetir):",
-        "restart_sogo_hint": "Necessites reiniciar el contenidor del servei SOGo després d'afegir un nou domini",
+        "post_domain_add": "Necessites reiniciar el contenidor del servei SOGo després d'afegir un nou domini",
         "goto_null": "Descartar mail silenciosament",
         "validation_success": "Validated successfully",
         "activate_filter_warn": "All other filters will be deactivated, when active is checked.",
diff --git a/data/web/lang/lang.cs.json b/data/web/lang/lang.cs.json
index e61c3ed9..843b1ac1 100644
--- a/data/web/lang/lang.cs.json
+++ b/data/web/lang/lang.cs.json
@@ -778,7 +778,7 @@
         "select_domain": "Nejdříve vyberte doménu",
         "password": "Heslo",
         "password_repeat": "Potvrzení nového hesla (opakujte)",
-        "restart_sogo_hint": "Po přidání nové domény je nutné restartovat SOGo kontejner!",
+        "post_domain_add": "Po přidání nové domény je nutné restartovat SOGo kontejner!",
         "goto_null": "Tiše zahazovat poštu",
         "goto_ham": "Učit se jako <span class=\"text-success\"><b>ham</b></span>",
         "goto_spam": "Učit se jako <span class=\"text-danger\"><b>spam</b></span>",
diff --git a/data/web/lang/lang.de.json b/data/web/lang/lang.de.json
index 7b3d02ec..14a6ef8e 100644
--- a/data/web/lang/lang.de.json
+++ b/data/web/lang/lang.de.json
@@ -820,7 +820,7 @@
         "select_domain": "Bitte zuerst eine Domain auswählen",
         "password": "Passwort",
         "password_repeat": "Passwort (Wiederholung)",
-        "restart_sogo_hint": "Der SOGo Container muss nach dem Hinzufügen einer neuen Domain neugestartet werden!",
+        "post_domain_add": "Der SOGo Container, \"sogo-mailcow\" muss nach dem Hinzufügen einer Domain neugestartet werden!<br><br>Im Anschluss sollte die DNS-Konfiguration der Domain überprüft- und \"acme-mailcow\" gegebenenfalls neugestartet werden, um Änderungen am Zertifikat zu übernehmen (autoconfig.&lt;domain&gt;, autodiscover.&lt;domain&gt;).<br>Dieser Schritt ist optional und wird alle 24 Stunden automatisch ausgeführt.",
         "goto_null": "Nachrichten sofort verwerfen",
         "goto_ham": "Nachrichten als <span class=\"text-success\"><b>Ham</b></span> lernen",
         "goto_spam": "Nachrichten als <span class=\"text-danger\"><b>Spam</b></span> lernen",
diff --git a/data/web/lang/lang.en.json b/data/web/lang/lang.en.json
index f1c18d15..0d8d2870 100644
--- a/data/web/lang/lang.en.json
+++ b/data/web/lang/lang.en.json
@@ -819,7 +819,7 @@
         "select_domain": "Please select a domain first",
         "password": "Password",
         "password_repeat": "Confirmation password (repeat)",
-        "restart_sogo_hint": "You will need to restart the SOGo service container after adding a new domain!",
+        "post_domain_add": "The SOGo container, \"sogo-mailcow\", needs to be restarted after adding a new domain!<br><br>Additionally the domains DNS configuration should be reviewed. Once the DNS configuration is approved, restart \"acme-mailcow\" to automatically generate certificates for your new domain (autoconfig.&lt;domain&gt;, autodiscover.&lt;domain&gt;).<br>This step is optional and will be retried every 24 hours.",
         "goto_null": "Silently discard mail",
         "goto_ham": "Learn as <span class=\"text-success\"><b>ham</b></span>",
         "goto_spam": "Learn as <span class=\"text-danger\"><b>spam</b></span>",
diff --git a/data/web/lang/lang.es.json b/data/web/lang/lang.es.json
index ce051a90..6d3e094a 100644
--- a/data/web/lang/lang.es.json
+++ b/data/web/lang/lang.es.json
@@ -379,7 +379,7 @@
         "select_domain": "Por favor elige un dominio primero",
         "password": "Constraseña:",
         "password_repeat": "Confirmación de contraseña (repetir):",
-        "restart_sogo_hint": "<b>Nota:</b> Necesitarás reiniciar el contenedor del servicio SOGo despues de agregar un nuevo dominio",
+        "post_domain_add": "<b>Nota:</b> Necesitarás reiniciar el contenedor del servicio SOGo despues de agregar un nuevo dominio",
         "port": "Puerto",
         "mailbox_quota_def": "Cuota de buzón predeterminada",
         "syncjob": "Añadir trabajo de sincronización",
diff --git a/data/web/lang/lang.fi.json b/data/web/lang/lang.fi.json
index 7ed60e79..2ff10640 100644
--- a/data/web/lang/lang.fi.json
+++ b/data/web/lang/lang.fi.json
@@ -778,7 +778,7 @@
         "select_domain": "Valitse ensin verkkotunnus",
         "password": "Salasana",
         "password_repeat": "Vahvista salasana (anna uudelleen salasanasi)",
-        "restart_sogo_hint": "Sinun on käynnistettävä SOGo-palvelusäiliö uudelleen, kun olet lisännyt uuden verkkotunnuksen!",
+        "post_domain_add": "Sinun on käynnistettävä SOGo-palvelusäiliö uudelleen, kun olet lisännyt uuden verkkotunnuksen!",
         "goto_null": "Hylkää posti hiljaa",
         "goto_ham": "Opi nimellä <span class=\"text-success\"><b>ham</b></span>",
         "goto_spam": "Opi nimellä <span class=\"text-danger\"><b>spam</b></span>",
diff --git a/data/web/lang/lang.fr.json b/data/web/lang/lang.fr.json
index ec3bd815..446d340a 100644
--- a/data/web/lang/lang.fr.json
+++ b/data/web/lang/lang.fr.json
@@ -381,7 +381,7 @@
         "select_domain": "Merci de d'abord sélectionner un domaine",
         "password": "Mot de passe",
         "password_repeat": "Confirmation du mot de passe (répéter)",
-        "restart_sogo_hint": "Vous devrez redémarrer le container du service SOGo après l'ajout d'un nouveau domaine !",
+        "post_domain_add": "Vous devrez redémarrer le container du service SOGo après l'ajout d'un nouveau domaine !",
         "goto_null": "Ignorer silencieusement le courriel"
     },
     "login": {
diff --git a/data/web/lang/lang.it.json b/data/web/lang/lang.it.json
index f64b10ec..03916ffd 100644
--- a/data/web/lang/lang.it.json
+++ b/data/web/lang/lang.it.json
@@ -299,7 +299,7 @@
         "select_domain": "Perfavore seleziona il dominio prima",
         "password": "Password:",
         "password_repeat": "Conferma password (riscrivi):",
-        "restart_sogo_hint": "Dovrai riavviare il servizio SOGo dopo aver aggiunto un nuovo dominio!"
+        "post_domain_add": "Dovrai riavviare il servizio SOGo dopo aver aggiunto un nuovo dominio!"
     },
     "login": {
         "username": "Username",
diff --git a/data/web/lang/lang.lv.json b/data/web/lang/lang.lv.json
index 7ea23c1b..66e924fb 100644
--- a/data/web/lang/lang.lv.json
+++ b/data/web/lang/lang.lv.json
@@ -462,7 +462,7 @@
         "select_domain": "Lūdzu sākumā izvēlaties domēnu",
         "password": "Parole",
         "password_repeat": "Apstiprinājuma parole (atkārtot)",
-        "restart_sogo_hint": "Jums būs nepieciešams atsāknēt SOGo servisa konteineru pēc jauna domēna pievienošanas!",
+        "post_domain_add": "Jums būs nepieciešams atsāknēt SOGo servisa konteineru pēc jauna domēna pievienošanas!",
         "goto_null": "Klusām dzēst pastu",
         "validation_success": "Apstiprināts veiksmīgi",
         "activate_filter_warn": "Visi pārējie filtri tiks deaktivizēti, kad aktīvs ir atzīmēts.",
diff --git a/data/web/lang/lang.nl.json b/data/web/lang/lang.nl.json
index 35b7e8d1..7da09edb 100644
--- a/data/web/lang/lang.nl.json
+++ b/data/web/lang/lang.nl.json
@@ -797,7 +797,7 @@
         "select_domain": "Selecteer eerst een domein",
         "password": "Wachtwoord",
         "password_repeat": "Herhaal wachtwoord",
-        "restart_sogo_hint": "SOGo dient opnieuw opgestart te worden nadat een domein is toegevoegd",
+        "post_domain_add": "SOGo dient opnieuw opgestart te worden nadat een domein is toegevoegd",
         "goto_null": "Houd mail achterwege",
         "goto_ham": "Leer als <span class=\"text-success\"><b>ham</b></span>",
         "goto_spam": "Leer als <span class=\"text-danger\"><b>spam</b></span>",
diff --git a/data/web/lang/lang.pl.json b/data/web/lang/lang.pl.json
index 4ad0e09b..052dac9f 100644
--- a/data/web/lang/lang.pl.json
+++ b/data/web/lang/lang.pl.json
@@ -379,7 +379,7 @@
         "select_domain": "Proszę najpierw wybrać domenę",
         "password": "Hasło:",
         "password_repeat": "Potwierdź hasło(powtórz):",
-        "restart_sogo_hint": "Po dodaniu nowej domeny będziesz musiał ponownie uruchomić kontener serwisowy SOGo!"
+        "post_domain_add": "Po dodaniu nowej domeny będziesz musiał ponownie uruchomić kontener serwisowy SOGo!"
     },
     "login": {
         "username": "Nazwa użytkownika",
diff --git a/data/web/lang/lang.ru.json b/data/web/lang/lang.ru.json
index 9cb12fcd..eed0d51c 100644
--- a/data/web/lang/lang.ru.json
+++ b/data/web/lang/lang.ru.json
@@ -76,7 +76,7 @@
     "relay_all_info": "<small>Если вы выбрали <b>не</b> для ретрансляции всех получателей, вам нужно будет добавить (\"слепой\") почтовый ящик для каждого получателя, который должен быть ретранслирован.</small>",
     "relay_domain": "Ретрансляция этого домена",
     "relayhost_wrapped_tls_info": "Пожалуйста <b>не</b> используйте TLS порты (в основном это 465 порт).<br>\r\nИспользуйте любой <b>не</b> TLS порт который поддерживает STARTTLS. А для защиты от downgrate атак - настройке принудительную политику TLS.",
-    "restart_sogo_hint": "После добавления нового домена вам необходимо перезагрузить контейнер службы SOGo!",
+    "post_domain_add": "После добавления нового домена вам необходимо перезагрузить контейнер службы SOGo!",
     "select": "Пожалуйста, выберите...",
     "select_domain": "Пожалуйста, сначала выберите домен",
     "sieve_desc": "Краткое описание",
diff --git a/data/web/modals/mailbox.php b/data/web/modals/mailbox.php
index d0182227..a77eb9d2 100644
--- a/data/web/modals/mailbox.php
+++ b/data/web/modals/mailbox.php
@@ -176,7 +176,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
               <button class="btn btn-default" data-action="add_item" data-id="add_domain" data-api-url='add/domain' data-api-attr='{"restart_sogo":"1"}' href="#"><?=$lang['add']['add_domain_restart'];?></button>
             </div>
           </div>
-          <p><span class="glyphicon glyphicon-exclamation-sign text-danger"></span> <?=$lang['add']['restart_sogo_hint'];?></p>
+          <p><span class="glyphicon glyphicon-exclamation-sign text-danger"></span> <?=$lang['add']['post_domain_add'];?></p>
         </form>
       </div>
     </div>