diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php
index 073d58ea4..b6f95f28d 100644
--- a/e107_admin/cpage.php
+++ b/e107_admin/cpage.php
@@ -1030,7 +1030,7 @@ class page_admin_ui extends e_admin_ui
 
 			$newdata = e107::getCustomFields()->processDataPost('page_fields',$newdata);
 
-			$newdata['menu_name'] = preg_replace('/[^\w-*]/','-',$newdata['menu_name']);
+			$newdata['menu_name'] = preg_replace('/[^\w\-*]/','-',$newdata['menu_name']);
 
 			if(empty($newdata['page_sef']))
 			{
@@ -1074,11 +1074,16 @@ class page_admin_ui extends e_admin_ui
 		function beforeUpdate($newdata,$olddata, $id)
 		{
 
+			if(isset($newdata['page_title']) && isset($newdata['menu_name']) && empty($newdata['page_title']) && empty($newdata['menu_name']))
+			{
+				e107::getMessage()->addError(CUSLAN_79);
+				return false;
+			}
 			$newdata = e107::getCustomFields()->processDataPost('page_fields',$newdata);
 
 			if(isset($newdata['menu_name']))
 			{
-				$newdata['menu_name'] = preg_replace('/[^\w-*]/','',$newdata['menu_name']);
+				$newdata['menu_name'] = preg_replace('/[^\w\-*]/','',$newdata['menu_name']);
 			}