diff --git a/scripts/install b/scripts/install
index 1558f93..99a1146 100755
--- a/scripts/install
+++ b/scripts/install
@@ -131,6 +131,7 @@ ynh_add_nginx_config
 #=================================================
 db_name=$(ynh_sanitize_dbid --db_name=$app)
 db_pwd=$(ynh_string_random)	# Generate a random password
+ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 db_user=$db_name
 ynh_script_progression --message="Configuring OpenProject..." --weight=1
 sudo -iu $app cat >> $final_path/config/database.yml << EOF
@@ -164,8 +165,7 @@ ynh_script_progression --message="Creating a PostgreSQL database..." --weight=1
 
 ynh_app_setting_set --app=$app --key=dbpwd --value=$db_pwd	# Store the password in the app's config
 
-ynh_app_setting_set --app=$app --key=db_name --value=$db_name
-sudo -u postgres psql -c "CREATE USER $app WITH PASSWORD '$dbpwd';"
+sudo -u postgres psql -c "CREATE USER $app WITH PASSWORD '$db_pwd';"
 sudo -u postgres createdb -O $app $db_name