diff --git a/bin/v-get-database-credentials-of-domain b/bin/v-get-database-credentials-of-domain
index 7ebade2a..71dcfe31 100644
--- a/bin/v-get-database-credentials-of-domain
+++ b/bin/v-get-database-credentials-of-domain
@@ -91,6 +91,19 @@ if [ "$CMS_TYPE" = "joomla" ]; then
     rm $CONFIG_FILE_FULL_PATH_BACKUP
 fi
 
+if [ ! -z "$DATABASE_NAME" ]; then
+    DATABASE_NAME_WITHOUT_USER_PREFIX=$(get_database_name_without_user_prefix "$USER" "$DATABASE_NAME")
+fi
+if [ ! -z "$DATABASE_USERNAME" ]; then
+    DATABASE_USERNAME_WITHOUT_USER_PREFIX=$(get_database_name_without_user_prefix "$USER" "$DATABASE_USERNAME")
+fi
+
+DATABASE_NAME_WITHOUT_USER_PREFIX=$(escape_shell_quote $DATABASE_NAME_WITHOUT_USER_PREFIX)
+echo "DATABASE_NAME_WITHOUT_USER_PREFIX=$DATABASE_NAME_WITHOUT_USER_PREFIX"
+
+DATABASE_USERNAME_WITHOUT_USER_PREFIX=$(escape_shell_quote $DATABASE_USERNAME_WITHOUT_USER_PREFIX)
+echo "DATABASE_USERNAME_WITHOUT_USER_PREFIX=$DATABASE_USERNAME_WITHOUT_USER_PREFIX"
+
 DATABASE_NAME=$(escape_shell_quote $DATABASE_NAME)
 echo "DATABASE_NAME=$DATABASE_NAME"