diff --git a/src/utils/resources.py b/src/utils/resources.py
index 60a5f44f6..ba02930c9 100644
--- a/src/utils/resources.py
+++ b/src/utils/resources.py
@@ -1337,8 +1337,8 @@ class DatabaseAppResource(AppResource):
 
     def provision_or_update(self, context: Dict = {}):
         # This is equivalent to ynh_sanitize_dbid
-        db_name = self.app.replace("-", "_").replace(".", "_")
-        db_user = db_name
+        db_user = self.app.replace("-", "_").replace(".", "_")
+        db_name = self.get_setting("db_name") || db_user
         self.set_setting("db_name", db_name)
         self.set_setting("db_user", db_user)
 
@@ -1372,8 +1372,8 @@ class DatabaseAppResource(AppResource):
                 )
 
     def deprovision(self, context: Dict = {}):
-        db_name = self.app.replace("-", "_").replace(".", "_")
-        db_user = db_name
+        db_user = self.app.replace("-", "_").replace(".", "_")
+        db_name = self.get_setting("db_name") || db_user
 
         if self.dbtype == "mysql":
             self._run_script(