diff --git a/adminer/privileges.inc.php b/adminer/privileges.inc.php
index 9506aa5f..946aa7e1 100644
--- a/adminer/privileges.inc.php
+++ b/adminer/privileges.inc.php
@@ -3,7 +3,6 @@ page_header(lang('Privileges'));
 echo '<p><a href="' . htmlspecialchars($SELF) . 'user=">' . lang('Create user') . "</a></p>";
 $result = $dbh->query("SELECT User, Host FROM mysql.user ORDER BY Host, User");
 if (!$result) {
-	//! utilize information_schema.USER_PRIVILEGES in MySQL 5
 	?>
 	<form action=""><p>
 	<?php if (strlen($_GET["server"])) { ?><input type="hidden" name="server" value="<?php echo htmlspecialchars($_GET["server"]); ?>" /><?php } ?>
@@ -13,7 +12,7 @@ if (!$result) {
 	<input type="submit" value="<?php echo lang('Edit'); ?>" />
 	</p></form>
 <?php
-	// list logged user
+	// list logged user, information_schema.USER_PRIVILEGES lists just the current user too
 	$result = $dbh->query("SELECT SUBSTRING_INDEX(CURRENT_USER, '@', 1) AS User, SUBSTRING_INDEX(CURRENT_USER, '@', -1) AS Host");
 }
 echo "<table cellspacing='0'>\n";
diff --git a/adminer/user.inc.php b/adminer/user.inc.php
index 6cb43f84..48aa1337 100644
--- a/adminer/user.inc.php
+++ b/adminer/user.inc.php
@@ -113,7 +113,7 @@ if ($_POST) {
 	$row = $_POST;
 	$grants = $new_grants;
 } else {
-	$row = $_GET + array("host" => "localhost"); // create user on localhost by default
+	$row = $_GET + array("host" => $dbh->result($dbh->query("SELECT SUBSTRING_INDEX(CURRENT_USER, '@', -1)"))); // create user on the same domain by default
 	$row["pass"] = $old_pass;
 	if (strlen($old_pass)) {
 		$row["hashed"] = true;
diff --git a/todo.txt b/todo.txt
index ca0e59bd..e6422877 100644
--- a/todo.txt
+++ b/todo.txt
@@ -12,6 +12,7 @@ IE6 - <label for>
 Edit default values directly in table creation
 Single column foreign key definition in table creation
 Offer enum items in search
+Use event $intervals + microseconds in relative date functions
 Ability to select external style - list downloaded by JavaScript
 ? Column and table names auto-completition in SQL textarea
 ? Save token also to cookie - for session expiration and login in other window