diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php
index f0d2f439a..7c97fe88e 100644
--- a/e107_admin/cpage.php
+++ b/e107_admin/cpage.php
@@ -185,7 +185,7 @@ class page_chapters_ui extends e_admin_ui
 		
 		);
 
-		protected $fieldpref = array('checkboxes', 'chapter_icon', 'chapter_id', 'chapter_name', 'chapter_description','chapter_template', 'chapter_manager', 'chapter_order', 'options');
+		protected $fieldpref = array('checkboxes', 'chapter_icon', 'chapter_id', 'chapter_name', 'chapter_description','chapter_template', 'chapter_visibility', 'chapter_order', 'options');
 
 		protected $books = array();
 	
diff --git a/e107_admin/users.php b/e107_admin/users.php
index 8ec870817..2b1f58856 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -1323,6 +1323,7 @@ class users_admin_ui extends e_admin_ui
 		$sql 			= e107::getDb();
 		$e_event 		= e107::getEvent();
 		$admin_log		= e107::getAdminLog();
+		$pref = e107::getPref();
 		
 		if (!$_POST['ac'] == md5(ADMINPWCHANGE))
 		{
diff --git a/e107_plugins/page/e_shortcode.php b/e107_plugins/page/e_shortcode.php
index 68145a6b6..9e0b0df7f 100644
--- a/e107_plugins/page/e_shortcode.php
+++ b/e107_plugins/page/e_shortcode.php
@@ -138,7 +138,7 @@ class page_shortcodes extends e_shortcode
 		function sc_chapter_menus($parm=null)
 		{
 			$tp = e107::getParser();
-			$query = "SELECT * FROM #page AS p LEFT JOIN #page_chapters as ch ON p.page_chapter=ch.chapter_id WHERE ch.chapter_visibility IN (" . USERCLASS_LIST . ") AND ch.chapter_sef = '" . $tp->filter($parm['name'],'str') . "' ORDER BY p.page_order ASC ";
+			$query = "SELECT * FROM #page AS p LEFT JOIN #page_chapters as ch ON p.page_chapter=ch.chapter_id WHERE ch.chapter_visibility IN (" . USERCLASS_LIST . ") AND p.menu_class IN (" . USERCLASS_LIST . ") AND ch.chapter_sef = '" . $tp->filter($parm['name'],'str') . "' ORDER BY p.page_order ASC ";
 
 			$text = '';