diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index e02452d6..84c4271d 100644
--- a/adminer/create.inc.php
+++ b/adminer/create.inc.php
@@ -188,7 +188,7 @@ if (support("columns") || $TABLE == "") {
 		echo "<datalist id='collations'>" . optionlist($collations) . "</datalist>";
 		echo (preg_match("~sqlite|mssql~", JUSH) ? "" : "<input list='collations' name='Collation' value='" . h($row["Collation"]) . "' placeholder='(" . lang('collation') . ")'>");
 	}
-	echo "<input type='submit' value='<?php echo lang('Save'); ?>'>\n";
+	echo "<input type='submit' value='" . lang('Save') . "'>\n";
 }
 
 if (support("columns")) {
@@ -198,7 +198,7 @@ if (support("columns")) {
 	echo "</table>\n";
 	echo script("editFields();");
 	echo "</div>\n<p>\n";
-	echo lang('Auto Increment') . "<input type='number' name='Auto_increment' class='size' value='" . h($row["Auto_increment"]) . "'>\n";
+	echo lang('Auto Increment') . ": <input type='number' name='Auto_increment' class='size' value='" . h($row["Auto_increment"]) . "'>\n";
 	echo checkbox("defaults", 1, ($_POST ? $_POST["defaults"] : get_setting("defaults")), lang('Default values'), "columnShow(this.checked, 5)", "jsonly");
 	$comments = ($_POST ? $_POST["comments"] : get_setting("comments"));
 	echo (support("comment")
diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 998787a5..342ead48 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -357,7 +357,7 @@ function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = arra
 		echo "<tr" . ($display ? "" : " style='display: none;'") . ">\n";
 		echo ($type == "PROCEDURE" ? "<td>" . html_select("fields[$i][inout]", explode("|", $driver->inout), $field["inout"]) : "") . "<th>";
 		if ($display) {
-			echo "<input name='fields[$][field]' value='" . h($field["field"]) . "' data-maxlength='64' autocapitalize='off' aria-labelledby='label-name'>\n";
+			echo "<input name='fields[$i][field]' value='" . h($field["field"]) . "' data-maxlength='64' autocapitalize='off' aria-labelledby='label-name'>\n";
 		}
 		echo "<input type='hidden' name='fields[$i][orig]' value='" . h($orig) . "'>";
 		edit_type("fields[$i]", $field, $collations, $foreign_keys);