diff --git a/src/yunohost/tools.py b/src/yunohost/tools.py
index 8470a7b2..07db0587 100644
--- a/src/yunohost/tools.py
+++ b/src/yunohost/tools.py
@@ -185,6 +185,9 @@ def tools_maindomain(auth, new_domain=None):
         else:
             logger.info(out)
 
+    # Generate SSOwat configuration file
+    app_ssowatconf(auth)
+
     # Regen configurations
     try:
         with open('/etc/yunohost/installed', 'r') as f:
@@ -308,9 +311,6 @@ def tools_postinstall(domain, password, ignore_dyndns=False):
     domain_add(auth, domain, dyndns)
     tools_maindomain(auth, domain)
 
-    # Generate SSOwat configuration file
-    app_ssowatconf(auth)
-
     # Change LDAP admin password
     tools_adminpw(auth, password)