diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php
index cc933bb0e..7688018c8 100644
--- a/e107_admin/cpage.php
+++ b/e107_admin/cpage.php
@@ -1037,7 +1037,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']))
 			{
@@ -1081,11 +1081,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']);
 			}
 
 
diff --git a/e107_core/bbcodes/bb_p.php b/e107_core/bbcodes/bb_p.php
index ee6827db0..8b6d18e2b 100644
--- a/e107_core/bbcodes/bb_p.php
+++ b/e107_core/bbcodes/bb_p.php
@@ -60,7 +60,8 @@ class bb_p extends e_bb_base
 
 		$parms = eHelper::scParams($parm);
 				
-		$class = " ".e107::getBB()->getClass('p'); // consistent classes across all themes. 
+		$class = vartrue($parms['class']) ? ' class="'.eHelper::secureClassAttr($parms['class']).' ' : ' class="';
+		$class .= e107::getBB()->getClass('p').'"'; // consistent classes across all themes.
 		
 		$id = vartrue($parms['id']) ? ' id="'.eHelper::secureIdAttr($parms['id']).'"' : '';
 		$style = vartrue($parms['style']) ? ' style="'.eHelper::secureStyleAttr($parms['style']).'"' : '';