diff --git a/scripts/install b/scripts/install
index 3b045d4..d1b8588 100755
--- a/scripts/install
+++ b/scripts/install
@@ -168,7 +168,6 @@ ynh_store_file_checksum --file="$final_path/config/configuration.yml"
 #=================================================
 ynh_script_progression --message="Creating a PostgreSQL database..." --weight=1
 
-ynh_psql_create_user "$db_user" "$db_pwd"
 ynh_psql_create_db "$db_name" "$db_user" "$db_pwd"
 
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index f058a86..97cf300 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -49,8 +49,7 @@ ynh_remove_systemd_config
 ynh_script_progression --message="Removing the PostgreSQL database..."  --weight=1
 
 # Remove a database if it exists, along with the associated user
-ynh_psql_drop_db "$db_name"
-ynh_psql_drop_user "$db_user"
+ynh_psql_remove_db "$db_name" "$db_user"
 
 #=================================================
 # REMOVE DEPENDENCIES