diff --git a/adminer/database.inc.php b/adminer/database.inc.php
index 1ce45531..6800d0e5 100644
--- a/adminer/database.inc.php
+++ b/adminer/database.inc.php
@@ -57,10 +57,7 @@ if ($_POST) {
echo ($_POST["add_x"] || strpos($name, "\n")
? '
'
: ''
-) . "\n";
-if ($collations) {
- html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $collate);
-}
+) . "\n" . ($collations ? html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $collate) : "");
?>
diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 900faa2d..c59e5100 100644
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -514,6 +514,7 @@ if (!defined("DRIVER")) {
* @return string
*/
function create_database($db, $collation) {
+ global $connection;
set_session("databases", null);
return queries("CREATE DATABASE " . idf_escape($db) . ($collation ? " COLLATE " . $connection->quote($collation) : ""));
}