diff --git a/scripts/install b/scripts/install
index 4a2e055..dc898e3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -79,7 +79,7 @@ db_pwd=$(ynh_string_random 30)
 ynh_app_setting_set "$app" db_name "$db_name"
 ynh_app_setting_set "$app" db_pwd "$db_pwd"
 ynh_psql_test_if_first_run
-ynh_psql_create_db "$db_name" "$db_name" "$db_pwd"
+ynh_psql_setup_db "$db_name" "$db_name" "$db_pwd"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
diff --git a/scripts/restore b/scripts/restore
index 81e8162..c391ae4 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -92,7 +92,7 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_print_info "Restoring the PostgreSQL database..."
 
 ynh_psql_test_if_first_run
-ynh_psql_create_db "$db_name" "$db_name" "$db_pwd"
+ynh_psql_setup_db "$db_name" "$db_name" "$db_pwd"
 ynh_psql_execute_file_as_root ./db.sql "$db_name"
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 26686d5..fb60cc3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -59,6 +59,9 @@ ynh_secure_remove "/etc/apt/sources.list.d/yarn.list"
 # Remove old log file
 ynh_secure_remove "/var/log/$app/"
 
+# Create PostgreSQL User
+ynh_psql_create_user $db_name $db_pwd
+
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================