diff --git a/scripts/install b/scripts/install
index 78906cc..506c618 100644
--- a/scripts/install
+++ b/scripts/install
@@ -13,7 +13,7 @@ python3 -m venv venv
 if [ $develop -eq 1 ]
 then
     ynh_add_config --template="../conf/extra_url" --destination="./extra_url"
-    pip_option='--extra-index-url "https://pypi.diacamma.org"'
+    pip_option='--extra-index-url https://pypi.diacamma.org/simple'
 else
     pip_option=''
 fi
diff --git a/scripts/restore b/scripts/restore
index 9a0e1c6..cc14d55 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -3,35 +3,14 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
+
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
 ynh_script_progression --message="Restoring the app main directory..." --weight=1
 
 ynh_restore_file --origin_path="$install_dir"
-
-pushd $install_dir
-venv/bin/lucterios_admin.py check
-venv/bin/lucterios_admin.py update
-venv/bin/lucterios_admin.py refreshall
-popd
-
-refresh_collect
-
-check_params
-
-
-#=================================================
-# RESTORE THE MYSQL DATABASE
-#=================================================
-
-ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1
-
-ynh_psql_test_if_first_run
-db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
-ynh_psql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$db_pwd
-# Restore dump
-ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < dbbackup.sql
+ynh_restore_file --origin_path="$data_dir"
 
 #=================================================
 # RESTORE SYSTEM CONFIGURATIONS
@@ -49,7 +28,29 @@ yunohost service add ${app} --log="/var/log/${app}/${app}.log"
 
 ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 
-# Other various files...
+#=================================================
+# RESTORE THE MYSQL DATABASE
+#=================================================
+
+ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1
+
+# Restore dump
+ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < dbbackup.sql
+
+#=================================================
+# RESTORE THE APP MAIN DIR
+#=================================================
+ynh_script_progression --message="Refresh the app main directory..." --weight=1
+
+pushd $install_dir
+venv/bin/lucterios_admin.py check
+venv/bin/lucterios_admin.py update
+venv/bin/lucterios_admin.py refreshall
+popd
+
+refresh_collect
+
+check_params
 
 #=================================================
 # RELOAD NGINX AND PHP-FPM OR THE APP SERVICE