diff --git a/webmin/edit_categories.cgi b/webmin/edit_categories.cgi
index 2f0fe0507..3d6fd131c 100755
--- a/webmin/edit_categories.cgi
+++ b/webmin/edit_categories.cgi
@@ -28,9 +28,10 @@ $file .= ".".$in{'lang'} if ($in{'lang'});
 read_file($file, \%catnames);
 foreach $t (keys %text) {
 	$t =~ s/^category_// || next;
+	$field = $t || "other";
 	print &ui_columns_row([
 		$t || "<i>other</i>",
-		&ui_opt_textbox($t, $catnames{$t}, 30,
+		&ui_opt_textbox($field, $catnames{$t}, 30,
 			$text{'default'}, $text{'categories_custom'}),
 		], [ "valign=middle","valign=middle" ]);
 	$realcat{$t}++;
diff --git a/webmin/save_categories.cgi b/webmin/save_categories.cgi
index ab00a0d00..262f40329 100755
--- a/webmin/save_categories.cgi
+++ b/webmin/save_categories.cgi
@@ -8,9 +8,10 @@ require './webmin-lib.pl';
 # Save built-in categories
 foreach $t (keys %text) {
 	$t =~ s/^category_// || next;
-	if (!$in{$t."_def"}) {
-		$in{$t} || &error(&text('categories_edesc', $t ? $t : 'other'));
-		$catnames{$t} = $in{$t};
+	$field = $t || "other";
+	if (!$in{$field."_def"}) {
+		$in{$field} || &error(&text('categories_edesc', $t || 'other'));
+		$catnames{$t} = $in{$field};
 		}
 	}