diff --git a/yunohost_domain.py b/yunohost_domain.py
index e117eb6c..6daa64db 100644
--- a/yunohost_domain.py
+++ b/yunohost_domain.py
@@ -116,16 +116,16 @@ def domain_add(domains, web=False):
                 for line in conf_lines:
                         conf.write(line + '\n')
 
+            if web:
+                _apache_config(domain)
+                _lemon_config(domain)
+
             if yldap.add('virtualdomain=' + domain + ',ou=domains', attr_dict):
                 result.append(domain)
                 continue
             else:
                 raise YunoHostError(169, _("An error occured during domain creation"))
 
-            if web:
-                _apache_config(domain)
-                _lemon_config(domain)
-
         win_msg(_("Domain(s) successfully created"))
 
         return { 'Domains' : result }
diff --git a/yunohost_tools.py b/yunohost_tools.py
index 071d6071..113afc38 100644
--- a/yunohost_tools.py
+++ b/yunohost_tools.py
@@ -150,7 +150,7 @@ def tools_maindomain(old_domain, new_domain):
     m = os.system('service postfix restart')
 
     if a == b == c == d == e == f == g == h == i == j == k == l == m == 0:
-        win_msg(_("YunoHost main domain has been successfully changed"))
+        win_msg(_("Main domain has been successfully changed"))
     else:
         raise YunoHostError(17, _("There were a problem during domain changing"))