diff --git a/manifest.toml b/manifest.toml
index f41c138..8cd3fbf 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Webtrees"
 description.en = "Web-based genealogy application"
 description.fr = "Logiciel libre de généalogie en ligne"
 
-version = "2.1.18~ynh1"
+version = "2.1.18~ynh2"
 
 maintainers = []
 
diff --git a/scripts/install b/scripts/install
index 6ccb81f..a26244d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -55,7 +55,7 @@ ynh_add_fpm_config
 ynh_add_config --template="config.ini.php" --destination="$install_dir/data/config.ini.php"
 
 # Load initial SQL into the new database
-ynh_mysql_connect_as --user="$db_name" "--password=$db_pwd" < "../conf/sql/webtrees.sql"
+ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/sql/webtrees.sql"
 
 # Replace variables in sql scripts
 ynh_replace_string --match_string="__USER_NAME__" --replace_string="$admin_username" --target_file="../conf/sql/admin.sql"
@@ -63,7 +63,7 @@ ynh_replace_string --match_string="__NAME__" --replace_string="$admin_name" --ta
 ynh_replace_string --match_string="__USER_EMAIL__" --replace_string="$admin_email" --target_file="../conf/sql/admin.sql"
 ynh_replace_string --match_string="__ADMIN_PASSWORD_HASHED__" --replace_string="$admin_password_hashed" --target_file="../conf/sql/admin.sql"
 
-ynh_mysql_connect_as --user="$db_name" "--password=$db_pwd" < "../conf/sql/admin.sql"
+ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/sql/admin.sql"
 
 #=================================================
 # END OF SCRIPT