diff --git a/README.rst b/README.rst
index 74e5f61..f24c596 100644
--- a/README.rst
+++ b/README.rst
@@ -47,6 +47,10 @@ run the following command::
 
   $ ./run.py --stop-after-configfile-check <your domain>
 
+An interactive mode is also available::
+
+  $ ./run.py --interactive <your domain>
+
 Make your modifications and run the installer as usual.
 
 By default, the latest Modoboa version is installed but you can select
diff --git a/modoboa_installer/config_dict_template.py b/modoboa_installer/config_dict_template.py
index 55a1319..933fae5 100644
--- a/modoboa_installer/config_dict_template.py
+++ b/modoboa_installer/config_dict_template.py
@@ -129,11 +129,11 @@ ConfigDictTemplate = [
                  },
                  {
                     "option": "venv_path",
-                    "default": "%(home_dir)s/instance",
+                    "default": "%(home_dir)s/env",
                  },
                  {
                     "option": "instance_path",
-                    "default": "%(home_dir)s/env",
+                    "default": "%(home_dir)s/instance",
                  },
                  {
                     "option": "timezone",
@@ -161,7 +161,7 @@ ConfigDictTemplate = [
                         "modoboa-stats modoboa-webmail modoboa-contacts"),
                  },
                  {
-                    "option": "devmod",
+                    "option": "devmode",
                     "default": "false",
                  },
             ]
diff --git a/run.py b/run.py
index 45c666e..385da45 100755
--- a/run.py
+++ b/run.py
@@ -53,6 +53,7 @@ def main(input_args):
     if not config.has_section("general"):
         config.add_section("general")
     config.set("general", "domain", args.domain)
+    config.set("dovecot", "domain", args.domain)
     config.set("modoboa", "version", args.version)
     utils.printcolor(
         "Your mail server will be installed with the following components:",