diff --git a/adminer/include/lang.inc.php b/adminer/include/lang.inc.php
index c3ac8a72..bd159669 100644
--- a/adminer/include/lang.inc.php
+++ b/adminer/include/lang.inc.php
@@ -70,11 +70,11 @@ function lang($idf, $number = null) {
 }
 
 function switch_lang() {
-	global $LANG, $langs, $token;
+	global $LANG, $langs;
 	echo "<form action='' method='post'>\n<div id='lang'>";
 	echo lang('Language') . ": " . html_select("lang", $langs, $LANG, "this.form.submit();");
 	echo " <input type='submit' value='" . lang('Use') . "' class='hidden'>\n";
-	echo "<input type='hidden' name='token' value='$token'>\n";
+	echo "<input type='hidden' name='token' value='$_SESSION[token]'>\n"; // $token may be empty in auth.inc.php
 	echo "</div>\n</form>\n";
 }
 
diff --git a/changes.txt b/changes.txt
index e84cdf8c..221fd558 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,5 @@
 Adminer 3.6.2-dev:
+Fix switching language on first load
 
 Adminer 3.6.1 (released 2012-09-17):
 Fix compiled version on PHP with multibyte support