2 files changed, 3 insertions, 3 deletions
diff --git a/views/default/navigation/menu/default.php b/views/default/navigation/menu/default.php
index 0dc6dd6b3..0fa391433 100644
--- a/views/default/navigation/menu/default.php
+++ b/views/default/navigation/menu/default.php
@@ -9,7 +9,7 @@
  */
 
 // we want css classes to use dashes
-$vars['name'] = str_replace('_', '-', $vars['name']);
+$vars['name'] = preg_replace('/[^a-z0-9\-]/i', '-', $vars['name']);
 $headers = elgg_extract('show_section_headers', $vars, false);
 
 $class = "elgg-menu elgg-menu-{$vars['name']}";
diff --git a/views/default/navigation/menu/elements/item.php b/views/default/navigation/menu/elements/item.php
index f3e46315b..5d6a7e367 100644
--- a/views/default/navigation/menu/elements/item.php
+++ b/views/default/navigation/menu/elements/item.php
@@ -16,8 +16,8 @@ if ($item->getSelected()) {
 
 $children = $item->getChildren();
 if ($children) {
-	$item->setLinkClass($link_class);
-	$item->setLinkClass('elgg-menu-parent');
+	$item->addLinkClass($link_class);
+	$item->addLinkClass('elgg-menu-parent');
 }
 
 $item_class = $item->getItemClass();