diff --git a/application/forms/MigrationForm.php b/application/forms/MigrationForm.php
index c5d517f03..4330ed344 100644
--- a/application/forms/MigrationForm.php
+++ b/application/forms/MigrationForm.php
@@ -133,6 +133,18 @@ class MigrationForm extends CompatForm
                             . ' that has the appropriate credentials to resolve this issue.'
                         ),
                         implode(', ', $mm->getRequiredDatabasePrivileges())
+                    ))),
+                    new HtmlElement('br'),
+                    new HtmlElement('br'),
+                    new HtmlElement('span', null, Text::create(sprintf(
+                        $this->translate(
+                            'The database name may contain either an underscore or a percent sign.'
+                            . ' In MySQL these characters represent a wildcard. If part of a database name,'
+                            . ' they might not have been escaped when manually granting privileges.'
+                            . ' Privileges might not be detected in this case. Check the documentation and'
+                            . ' update your grants accordingly: %s'
+                        ),
+                        'https://dev.mysql.com/doc/refman/8.0/en/grant.html#grant-quoting'
                     )))
                 )
             );
diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
index f7092a176..d1786fccd 100644
--- a/modules/setup/application/forms/DatabaseCreationPage.php
+++ b/modules/setup/application/forms/DatabaseCreationPage.php
@@ -91,6 +91,19 @@ class DatabaseCreationPage extends Form
      */
     public function createElements(array $formData)
     {
+        if ($this->config['db'] === 'mysql' && preg_match('/[_%]/', $this->config['dbname'])) {
+            $this->warning(sprintf(
+                $this->translate(
+                    'The database name may contain either an underscore or a percent sign.'
+                    . ' In MySQL these characters represent a wildcard. If part of a database name,'
+                    . ' they might not have been escaped when manually granting privileges.'
+                    . ' Privileges might not be detected in this case. Check the documentation and'
+                    . ' update your grants accordingly: %s'
+                ),
+                'https://dev.mysql.com/doc/refman/8.0/en/grant.html#grant-quoting'
+            ));
+        }
+
         $skipValidation = isset($formData['skip_validation']) && $formData['skip_validation'];
         $this->addElement(
             'text',