diff --git a/adminer/user.inc.php b/adminer/user.inc.php
index 78e5674b..4909769b 100644
--- a/adminer/user.inc.php
+++ b/adminer/user.inc.php
@@ -51,8 +51,10 @@ if ($_POST && !$error) {
 	if ($_POST["drop"]) {
 		query_redirect("DROP USER $old_user", ME . "privileges=", lang('User has been dropped.'));
 	} else {
+		$created = false;
 		if ($old_user != $new_user) {
-			$error = !queries(($connection->server_info < 5 ? "GRANT USAGE ON *.* TO" : "CREATE USER") . " $new_user IDENTIFIED BY" . ($_POST["hashed"] ? " PASSWORD" : "") . " $pass");
+			$created = queries(($connection->server_info < 5 ? "GRANT USAGE ON *.* TO" : "CREATE USER") . " $new_user IDENTIFIED BY" . ($_POST["hashed"] ? " PASSWORD" : "") . " $pass");
+			$error = !$created;
 		} elseif ($_POST["pass"] != $old_pass || !$_POST["hashed"]) {
 			queries("SET PASSWORD FOR $new_user = " . ($_POST["hashed"] ? $pass : "PASSWORD($pass)"));
 		}
@@ -93,7 +95,7 @@ if ($_POST && !$error) {
 			}
 		}
 		queries_redirect(ME . "privileges=", (isset($_GET["host"]) ? lang('User has been altered.') : lang('User has been created.')), !$error);
-		if ($old_user != $new_user) {
+		if ($created) {
 			// delete new user in case of an error
 			$connection->query("DROP USER $new_user");
 		}
diff --git a/tests/15-privileges.html b/tests/15-privileges.html
index 577a74f5..f22c3985 100644
--- a/tests/15-privileges.html
+++ b/tests/15-privileges.html
@@ -108,7 +108,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='content']/table/tbody/tr[td[2]='adminer_test']/td[1]/a</td>
+	<td>//div[@id='content']/form/table/tbody/tr[td[2]='adminer_test']/td[3]/a</td>
 	<td></td>
 </tr>
 <tr>