diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index eb0338ab..9bd7277c 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -368,7 +368,7 @@ class Adminer {
 			}
 
 			echo "<tr title='" . h($name) . "'>";
-			echo "<th>$index[type]" . ($index['algorithm'] != $default_algorithm ? " ($index[algorithm])" : "");
+			echo "<th>$index[type]" . ($default_algorithm && $index['algorithm'] != $default_algorithm ? " ($index[algorithm])" : "");
 			echo "<td>" . implode(", ", $print);
 			echo "\n";
 		}
diff --git a/adminer/indexes.inc.php b/adminer/indexes.inc.php
index c027d910..1676e603 100644
--- a/adminer/indexes.inc.php
+++ b/adminer/indexes.inc.php
@@ -54,7 +54,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"]) {
 					&& array_values($existing["columns"]) === $columns
 					&& (!$existing["lengths"] || array_values($existing["lengths"]) === $lengths)
 					&& array_values($existing["descs"]) === $descs
-					&& $existing["algorithm"] === $index_algorithm
+					&& (!$index_algorithms || $existing["algorithm"] == $index_algorithm)
 				) {
 					// skip existing index
 					unset($indexes[$name]);