diff --git a/usermin/save_categories.cgi b/usermin/save_categories.cgi
index 7940ac899..d833593d1 100755
--- a/usermin/save_categories.cgi
+++ b/usermin/save_categories.cgi
@@ -16,7 +16,7 @@ foreach $t (keys %utext) {
 	if (!$in{$field."_def"}) {
 		$in{$field} ||
 			&error(&text('categories_edesc', $t ? $t : 'other'));
-		$catnames{$t} = $in{$field};
+		$catnames{$t} = &filter_javascript($in{$field});
 		}
 	}
 
diff --git a/webmin/save_categories.cgi b/webmin/save_categories.cgi
index 650d70492..25788c1b9 100755
--- a/webmin/save_categories.cgi
+++ b/webmin/save_categories.cgi
@@ -11,8 +11,8 @@ foreach $t (keys %text) {
 	$field = $t || "other";
 	if (!$in{$field."_def"}) {
 		$in{$field} || &error(&text('categories_edesc', $t || 'other'));
-		$catnames{$t} = $in{$field};
-		$catnames{'other'} = $in{$field} if ($t eq "");
+		$catnames{$t} = &filter_javascript($in{$field});
+		$catnames{'other'} = &filter_javascript($in{$field}) if ($t eq "");
 		}
 	}