diff --git a/adminer/database.inc.php b/adminer/database.inc.php
index b4e5d661..7d22f512 100644
--- a/adminer/database.inc.php
+++ b/adminer/database.inc.php
@@ -2,6 +2,7 @@
 if ($_POST && !$error && !isset($_POST["add_x"])) { // add is an image and PHP changes add.x to add_x
 	if (DB !== $_POST["name"]) {
 		// create or rename database
+		restart_session();
 		unset($_SESSION["databases"][$_GET["server"]]); // clear cache
 		$dbs = explode("\n", str_replace("\r", "", $_POST["name"]));
 		$failed = false;
@@ -15,6 +16,7 @@ if ($_POST && !$error && !isset($_POST["add_x"])) { // add is an image and PHP c
 			}
 		}
 		if (query_redirect(queries(), ME . "db=" . urlencode($last), lang('Database has been created.'), !strlen(DB), false, $failed)) {
+			//! move triggers
 			$result = $connection->query("SHOW TABLES");
 			while ($row = $result->fetch_row()) {
 				if (!queries("RENAME TABLE " . idf_escape($row[0]) . " TO " . idf_escape($_POST["name"]) . "." . idf_escape($row[0]))) {
diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 0306083a..d92a1f4f 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -358,7 +358,7 @@ class Adminer {
 	* @return string
 	*/
 	function messageQuery($query) {
-		session_start();
+		restart_session();
 		$id = "sql-" . count($_SESSION["messages"]);
 		$_SESSION["history"][$_GET["server"]][DB][] = $query;
 		return " <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('SQL command') . "</a><div id='$id' class='hidden'><pre class='jush-sql'>" . shorten_utf8($query, 1000) . '</pre><a href="' . h(ME . 'sql=&history=' . (count($_SESSION["history"][$_GET["server"]][DB]) - 1)) . '">' . lang('Edit') . '</a></div>';
diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index 2e742f56..3ebe077c 100644
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -92,8 +92,8 @@ include "./include/editing.inc.php";
 include "./include/export.inc.php";
 
 session_cache_limiter(""); // to allow restarting session
-if (@ini_set("session.use_cookies", false) !== false) { // @ - may be disabled
-	session_write_close(); // improves concurrency, may be restarted later
+if (!ini_get("session.use_cookies") || @ini_set("session.use_cookies", false) !== false) { // @ - may be disabled
+	session_write_close(); // improves concurrency if a user opens several pages at once, may be restarted later
 }
 
 $confirm = " onclick=\"return confirm('" . lang('Are you sure?') . "');\"";
diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index 4f8aa1ed..4e645dda 100644
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -52,10 +52,6 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 	if (strlen(DB) && $databases && !in_array(DB, $databases, true)) {
 		$databases = null;
 	}
-	if ((isset($databases) && !isset($_GET["sql"])) || !ini_get("session.use_cookies")) {
-		// improves concurrency if a user opens several pages at once
-		session_write_close();
-	}
 	if ($error) {
 		echo "<div class='error'>$error</div>\n";
 	}
diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 47c3d685..7a578c00 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -351,7 +351,7 @@ function drop_create($drop, $create, $location, $message_drop, $message_alter, $
 	$dropped = strlen($name) && ($_POST["dropped"] || queries($drop));
 	$created = queries($create);
 	if (!queries_redirect($location, (strlen($name) ? $message_alter : $message_create), $created) && $dropped) {
-		session_start();
+		restart_session();
 		$_SESSION["messages"][] = $message_drop;
 	}
 	return $dropped;
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 590d0f14..3697f6df 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -220,7 +220,7 @@ function restart_session() {
 */
 function redirect($location, $message = null) {
 	if (isset($message)) {
-		session_start();
+		restart_session();
 		$_SESSION["messages"][] = $message;
 	}
 	header("Location: " . (strlen($location) ? $location : "."));
diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index e047c4fc..2e9fce3b 100644
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -1,4 +1,5 @@
 <?php
+restart_session();
 $history = &$_SESSION["history"][$_GET["server"]][DB];
 if (!$error && $_POST["clear"]) {
 	$history = array();
@@ -27,7 +28,7 @@ if (!$error && $_POST) {
 		$space = "(\\s|/\\*.*\\*/|(#|-- )[^\n]*\n|--\n)";
 		$alter_database = "(CREATE|DROP)$space+(DATABASE|SCHEMA)\\b~isU";
 		$databases = &$_SESSION["databases"][$_GET["server"]];
-		if ((isset($databases) && !preg_match("~\\b$alter_database", $query)) || !ini_get("session.use_cookies")) { // quick check - may be inside string
+		if (!ini_get("session.use_cookies") || (isset($databases) && !preg_match("~\\b$alter_database", $query))) { // quick check - may be inside string
 			//! false positive with $fp and disabled ini_set() and enabled session.use_cookies
 			session_write_close();
 		}