diff --git a/README.md b/README.md
index 123c72d..da0b598 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Webtrees allows you to view and edit your genealogy on your website. It has full
 **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives.
 
 
-**Shipped version:** 2.1.16~ynh2
+**Shipped version:** 2.1.17~ynh1
 
 **Demo:** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo
 
diff --git a/README_fr.md b/README_fr.md
index b133ef2..08e92f0 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -23,7 +23,7 @@ Webtrees vous permet de visualiser et de modifier votre généalogie sur votre s
 
 **Remarque :** Il est préférable de mettre à niveau à partir du panneau d'administration Webtrees lorsqu'une nouvelle version arrive.
 
-**Version incluse :** 2.1.16~ynh2
+**Version incluse :** 2.1.17~ynh1
 
 **Démo :** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo
 
diff --git a/conf/sql/admin.sql b/conf/sql/admin.sql
index 127ed0c..16c6ba5 100644
--- a/conf/sql/admin.sql
+++ b/conf/sql/admin.sql
@@ -1,3 +1,3 @@
-INSERT INTO `wt_user` (`user_id`, `user_name`, `real_name`, `email`, `password`) VALUES (NULL, '__USER_NAME__', '__NAME__', '__USER_EMAIL__', '__PASSWORD__');
+INSERT INTO `wt_user` (`user_id`, `user_name`, `real_name`, `email`, `password`) VALUES (NULL, '__USER_NAME__', '__NAME__', '__USER_EMAIL__', '__ADMIN_PASSWORD__');
 INSERT INTO `wt_user_setting` (`user_id`, `setting_name`, `setting_value`) VALUES ('1', 'canadmin', '1'), ('1', 'verified', '1'), ('1', 'verified_by_admin', '1');
  
diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md
index bcec90b..40583c3 100644
--- a/doc/POST_INSTALL.md
+++ b/doc/POST_INSTALL.md
@@ -1,4 +1,4 @@
 Your credentials for the admin panel are:
 
 - admin username: __ADMIN_USERNAME__
-- admin password: __PASSWORD__
\ No newline at end of file
+- admin password: __ADMIN_PASSWORD__
\ No newline at end of file
diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md
index 5bb106a..3d1dd32 100644
--- a/doc/POST_INSTALL_fr.md
+++ b/doc/POST_INSTALL_fr.md
@@ -1,4 +1,4 @@
 Vos informations d'identification pour le panneau d'administration sont :
 
 - nom d'utilisateur administrateur : __ADMIN_USERNAME__
-- mot de passe administrateur : __PASSWORD__
\ No newline at end of file
+- mot de passe administrateur : __ADMIN_PASSWORD__
\ No newline at end of file
diff --git a/manifest.toml b/manifest.toml
index a9c34c2..74b11c4 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,9 +5,9 @@ name = "Webtrees"
 description.en = "Web-based genealogy application"
 description.fr = "Logiciel libre de généalogie en ligne"
 
-version = "2.1.16~ynh2"
+version = "2.1.17~ynh1"
 
-maintainers = ["Anmol Sharma"]
+maintainers = []
 
 [upstream]
 license = "GPL-3.0-or-later"
@@ -17,7 +17,7 @@ admindoc = "https://wiki.webtrees.net"
 code = "https://github.com/fisharebest/webtrees"
 
 [integration]
-yunohost = ">= 11.1.19"
+yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
 ldap = false
@@ -60,8 +60,8 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/fisharebest/webtrees/releases/download/2.1.16/webtrees-2.1.16.zip"
-        sha256 = "3b5dc78b4a2abac37eebb8fca0bb1a21339ad1316ca5d269083725ba92ffaf54"
+        url = "https://github.com/fisharebest/webtrees/releases/download/2.1.17/webtrees-2.1.17.zip"
+        sha256 = "91599632d1887d268f3ea7ce549138db508aca84b60d0c74106b6968be00b381"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.system_user]
diff --git a/scripts/install b/scripts/install
index fee6910..29496b7 100755
--- a/scripts/install
+++ b/scripts/install
@@ -13,8 +13,8 @@ source /usr/share/yunohost/helpers
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
 #=================================================
 
-password=$(ynh_string_random 24)
-admin_password=$(openssl passwd -1 -salt xyz $password)
+admin_password=$(ynh_string_random 24)
+admin_password_hashed=$(mkpasswd -m md5crypt --stdin <<< "$admin_password")
 admin_username=$YNH_APP_ARG_USERNAME
 admin_name=$YNH_APP_ARG_NAME
 admin_email=$YNH_APP_ARG_EMAIL
@@ -22,6 +22,7 @@ admin_email=$YNH_APP_ARG_EMAIL
 ynh_app_setting_set --app=$app --key=admin_username --value=$admin_username
 ynh_app_setting_set --app=$app --key=admin_name --value=$admin_name
 ynh_app_setting_set --app=$app --key=admin_email --value=$admin_email
+ynh_app_setting_set --app=$app --key=admin_password --value=$admin_password
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -43,11 +44,6 @@ ynh_script_progression --message="Configuring NGINX web server..."
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring PHP-FPM..." 
-
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config --usage=low --footprint=low
 
@@ -62,10 +58,10 @@ ynh_add_config --template="../conf/config.ini.php" --destination="$install_dir/d
 ynh_mysql_connect_as "$db_name" "$db_pwd" "$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"
-ynh_replace_string --match_string="__NAME__"       --replace_string="$admin_name"     --target_file="../conf/sql/admin.sql"
-ynh_replace_string --match_string="__USER_EMAIL__" --replace_string="$admin_email"    --target_file="../conf/sql/admin.sql"
-ynh_replace_string --match_string="__PASSWORD__"   --replace_string="$admin_password" --target_file="../conf/sql/admin.sql"
+ynh_replace_string --match_string="__USER_NAME__" --replace_string="$admin_username" --target_file="../conf/sql/admin.sql"
+ynh_replace_string --match_string="__NAME__" --replace_string="$admin_name" --target_file="../conf/sql/admin.sql"
+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 "$db_name" "$db_pwd" "$db_name" < "../conf/sql/admin.sql"
 
diff --git a/scripts/remove b/scripts/remove
index 949c74b..2c04d62 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -17,11 +17,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..."
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing PHP-FPM configuration"
-
 # Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config
 
diff --git a/scripts/restore b/scripts/restore
index 026e1e2..3740315 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -9,14 +9,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
@@ -34,6 +26,8 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================