diff --git a/scripts/install b/scripts/install
index 0e4a41b2..eab4de0f 100644
--- a/scripts/install
+++ b/scripts/install
@@ -27,8 +27,7 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url="/"
 is_public=$YNH_APP_ARG_IS_PUBLIC
-app_key=$(ynh_string_random --length=32 | base64)
-app_key="base64:$app_key"
+app_key="base64:$(ynh_string_random --length=32 | base64)"
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -74,22 +73,17 @@ ynh_system_user_create --username=$app --home_dir=$final_path
 #=================================================
 ynh_script_progression --message="Creating a PostgreSQL database..."
 
-ynh_psql_test_if_first_run
-
 db_name=$(ynh_sanitize_dbid --db_name=$app)
 db_user=$db_name
-db_pwd=$(ynh_string_random --length=32)
 ynh_app_setting_set --app=$app --key=db_name --value=$db_name
-ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd
-
-# Initialize database and store postgres password for upgrade
-ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
+ynh_psql_test_if_first_run
+ynh_psql_setup_db --db_user=$db_name --db_name=$db_name
 
 #=================================================
 # CONFIGURE REDIS DATABASE
 #=================================================
+ynh_script_progression --message="Creating a Redis database..."
 
-# Configure redis
 redis_db=$(ynh_redis_get_free_db)
 ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db"
 
@@ -188,6 +182,8 @@ popd
 ynh_script_progression --message="Installing the cron file..."
 
 ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
+chown root: "/etc/cron.d/$app"
+chmod 644 "/etc/cron.d/$app"
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/restore b/scripts/restore
index f20e0be7..65975726 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -114,7 +114,7 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 ynh_script_progression --message="Restoring the PostgreSQL database..."
 
-db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
+db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 ynh_psql_test_if_first_run
 ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
 ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
diff --git a/scripts/upgrade b/scripts/upgrade
index 63b9289d..1fc90916 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -22,7 +22,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
-db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
+db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 app_key=$(ynh_app_setting_get --app=$app --key=app_key)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 redis_db=$(ynh_app_setting_get --app=$app --key=redis_db)