diff --git a/connect.inc.php b/connect.inc.php
index db22707f..9025445d 100644
--- a/connect.inc.php
+++ b/connect.inc.php
@@ -1,6 +1,6 @@
 <?php
 if (!(strlen($_GET["db"]) ? $mysql->select_db($_GET["db"]) : isset($_GET["sql"]) || isset($_GET["dump"]) || isset($_GET["database"]))) {
-	unset($_SESSION[$_GET["server"]]["databases"]);
+	unset($_SESSION["databases"][$_GET["server"]]);
 	page_header(lang('Select database'));
 	if (strlen($_GET["db"])) {
 		echo "<p class='error'>" . lang('Invalid database.') . "</p>\n";
diff --git a/create.inc.php b/create.inc.php
index d931127c..e09b371f 100644
--- a/create.inc.php
+++ b/create.inc.php
@@ -90,7 +90,7 @@ $collations = collations();
 <select name="Collation"><option value="">(<?php echo lang('collation'); ?>)</option><?php echo optionlist($collations, $row["Collation"]); ?></select>
 <input type="submit" value="<?php echo lang('Save'); ?>" />
 </p>
-<?php $column_comments = edit_fields($row["fields"]); ?>
+<?php $column_comments = edit_fields($row["fields"], $collations); ?>
 <p><?php echo lang('Comment'); ?>: <input name="Comment" value="<?php echo htmlspecialchars($row["Comment"]); ?>" maxlength="60" />
 <script type="text/javascript">
 document.write('<label for="column_comments"><input type="checkbox" id="column_comments"<?php if ($column_comments) { ?> checked="checked"<?php } ?> onclick="column_comments_click(this.checked);" /><?php echo lang('Show column comments'); ?></label>');
diff --git a/database.inc.php b/database.inc.php
index 2e6bf818..ddcfd66d 100644
--- a/database.inc.php
+++ b/database.inc.php
@@ -6,7 +6,7 @@ if ($_POST && !$error) {
 		}
 	} elseif ($_GET["db"] !== $_POST["name"]) {
 		if ($mysql->query("CREATE DATABASE " . idf_escape($_POST["name"]) . ($_POST["collation"] ? " COLLATE '" . $mysql->escape_string($_POST["collation"]) . "'" : ""))) {
-			unset($_SESSION[$_GET["server"]]["databases"]);
+			unset($_SESSION["databases"][$_GET["server"]]);
 			if (!strlen($_GET["db"])) {
 				redirect(preg_replace('~db=[^&]*&~', '', $SELF) . "db=" . urlencode($_POST["name"]), lang('Database has been created.'));
 			}
diff --git a/design.inc.php b/design.inc.php
index 12f8c7ca..9e9435c2 100644
--- a/design.inc.php
+++ b/design.inc.php
@@ -28,7 +28,7 @@ function page_header($title) {
 		echo "<p class='message'>$_SESSION[message]</p>\n";
 		$_SESSION["message"] = "";
 	}
-	if (isset($_SESSION[$_GET["server"]]["databases"])) {
+	if (isset($_SESSION["databases"][$_GET["server"]])) {
 		session_write_close();
 	}
 }
@@ -52,10 +52,10 @@ function page_footer($missing = false) {
 <select name="db" onchange="this.form.submit();"><option value="">(<?php echo lang('database'); ?>)</option>
 <?php
 		flush();
-		if (!isset($_SESSION[$_GET["server"]]["databases"])) {
-			$_SESSION[$_GET["server"]]["databases"] = get_vals("SHOW DATABASES");
+		if (!isset($_SESSION["databases"][$_GET["server"]])) {
+			$_SESSION["databases"][$_GET["server"]] = get_vals("SHOW DATABASES");
 		}
-		echo optionlist($_SESSION[$_GET["server"]]["databases"], $_GET["db"]);
+		echo optionlist($_SESSION["databases"][$_GET["server"]], $_GET["db"]);
 		?>
 </select><?php if (isset($_GET["sql"])) { ?><input type="hidden" name="sql" value="" /><?php } ?></p>
 <noscript><p><input type="submit" value="<?php echo lang('Use'); ?>" /></p></noscript>