diff --git a/conf/mail.exs b/conf/mail.exs
index f22ef70..f91d016 100644
--- a/conf/mail.exs
+++ b/conf/mail.exs
@@ -8,7 +8,7 @@ config :mobilizon, Mobilizon.Web.Email.Mailer,
   username: "__YNH_USER__",
   password: "__YNH_USER_PASSWORD__",
   # can be `:always` or `:never`
-  tls: :never,
+  tls: :if_available,
   allowed_tls_versions: [:"tlsv1.2"],
   retries: 1,
   # can be `true`
diff --git a/scripts/install b/scripts/install
index b657d9c..753dfbe 100644
--- a/scripts/install
+++ b/scripts/install
@@ -156,7 +156,7 @@ pushd $final_path/$app
     sudo -u "$app" MIX_ENV=prod mix local.rebar --force
     sudo -u "$app" MIX_ENV=prod mix deps.get
     sudo -u "$app" MIX_ENV=prod mix compile
-    sudo -u "$app" MIX_ENV=prod mix mobilizon.instance gen --force --output $config --output-psql /tmp/setup_db.psql --domain $domain --instance-name "Mobilizon" --admin-email $admin_email --dbhost localhost --dbname $db_name --dbuser $db_user --dbpass $db_pwd --listen-port $port
+    sudo -u "$app" MIX_ENV=prod mix mobilizon.instance gen --force --output $config --output-psql /tmp/setup_db.psql --domain $domain --instance-name "Mobilizon" --admin-email "$app@$domain" --dbhost localhost --dbname $db_name --dbuser $db_user --dbpass $db_pwd --listen-port $port
 popd
 
 cat "../conf/ldap.exs" >> "$config"