diff --git a/src/domain.py b/src/domain.py
index 4c4ed3472..f49f96e46 100644
--- a/src/domain.py
+++ b/src/domain.py
@@ -140,7 +140,7 @@ def _get_parent_domain_of(domain):
         return _get_parent_domain_of(parent_domain)
 
 
-@is_unit_operation()
+@is_unit_operation(exclude=["subscribe"])
 def domain_add(operation_logger, domain, subscribe=None, no_subscribe=False):
     """
     Create a custom domain
@@ -243,7 +243,7 @@ def domain_add(operation_logger, domain, subscribe=None, no_subscribe=False):
     logger.success(m18n.n("domain_created"))
 
 
-@is_unit_operation()
+@is_unit_operation(exclude=["unsubscribe"])
 def domain_remove(operation_logger, domain, remove_apps=False, force=False, unsubscribe=None, no_unsubscribe=False):
     """
     Delete domains
diff --git a/src/dyndns.py b/src/dyndns.py
index 6b64c1e78..9fd25442c 100644
--- a/src/dyndns.py
+++ b/src/dyndns.py
@@ -106,7 +106,6 @@ def dyndns_subscribe(operation_logger, domain=None, password=None):
                 is_password=True,
                 confirm=True
             )
-        operation_logger.data_to_redact.append(password)
         assert_password_is_strong_enough("admin", password)
 
     if not is_subscribing_allowed():
@@ -218,7 +217,6 @@ def dyndns_unsubscribe(operation_logger, domain, password=None):
             m18n.n("ask_password"),
             is_password=True
         )
-    operation_logger.data_to_redact.append(password)
     assert_password_is_strong_enough("admin", password)
 
     operation_logger.start()
diff --git a/src/tools.py b/src/tools.py
index b77279208..032bbea9f 100644
--- a/src/tools.py
+++ b/src/tools.py
@@ -180,12 +180,11 @@ def _detect_virt():
     return out.split()[0]
 
 
-@is_unit_operation()
+@is_unit_operation(exclude=["subscribe","password"])
 def tools_postinstall(
     operation_logger,
     domain,
     password,
-    ignore_dyndns=False,
     subscribe=None,
     no_subscribe=False,
     force_password=False,