diff --git a/comment.php b/comment.php
index 73efa55bf..6ae080849 100644
--- a/comment.php
+++ b/comment.php
@@ -122,7 +122,7 @@ if(e_AJAX_REQUEST) // TODO improve security
 			$row['user_id']				= USERID;
 			$row['user_name'] 			= USERNAME;
 			$row['comment_datestamp'] 	= time();
-			$row['comment_blocked']		= (vartrue($pref['comments_moderate']) ? 2 : 0);
+			$row['comment_blocked']		= (check_class($pref['comments_moderate']) ? 2 : 0);
 			
 			$width = ($pid) ? 5 : 0;
 			
diff --git a/e107_admin/header.php b/e107_admin/header.php
index 0d83a88ed..380653f0c 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -29,8 +29,8 @@ e107::getDb()->db_Mark_Time('(Header Top)');
 e107::js('core', 	'colorbox/jquery.colorbox-min.js', 'jquery', 2);
 e107::css('core', 	'colorbox/colorbox.css', 'jquery');
 
-e107::js('core', 	'fancybox/jquery.fancybox-1.3.4.js', 'jquery', 2);
-e107::css('core', 	'fancybox/jquery.fancybox-1.3.4.css', 'jquery');
+// e107::js('core', 	'fancybox/jquery.fancybox-1.3.4.js', 'jquery', 2);
+// e107::css('core', 	'fancybox/jquery.fancybox-1.3.4.css', 'jquery');
 
 e107::js('core', 	'jquery.elastic.js', 'jquery', 2);
 e107::js('core', 	'jquery-ui-timepicker-addon.js', 'jquery', 2);
diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index 8d93e4ad4..0e50ab852 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -29,6 +29,36 @@ if(! getperms("1"))
 
 include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
 $e_sub_cat = 'prefs';
+
+//FIXME temporary fix - need universal solution. 
+e107::js('inline',"
+$(document).ready(function()
+{	
+	var hash = document.location.hash;
+	if(hash)
+	{
+		$('.plugin-navigation a').each(function(index) {
+    			var ot = $(this).attr('href');
+				$(ot).hide();
+				$(this).closest('li').removeClass('active');
+				$(this).switchClass( 'link-active', 'link', 0 );
+			});
+		var button = '#eplug-nav-' + hash.replace('#', '') + '-prev-nav';
+		$(hash).show();
+		$(button).switchClass('link', 'link-active', 30 );
+		$(button).closest('li').addClass('active');
+	}
+	else
+	{
+		$('#core-prefs-main').show();	
+	}
+		
+});	
+","jquery");
+
+
+
+
 require_once (e_ADMIN."auth.php");
 
 $e_userclass = e107::getUserClass(); 
@@ -197,7 +227,7 @@ $pref['membersonly_exceptions'] = implode("\n",$pref['membersonly_exceptions']);
 $text = "
 <div id='core-prefs'>
 	<form class='admin-menu' method='post' action='".e_SELF."'>
-		<fieldset id='core-prefs-main'>
+		<fieldset class='e-hideme' id='core-prefs-main'>
 			<legend>".PRFLAN_1."</legend>
 			<table class='adminform'>
 				<colgroup>
@@ -1315,10 +1345,13 @@ $text .= "
 					</tr>
 
 					<tr>
-						<td class='label'>Approve Comments: </td>
+						<td class='label'>Moderate Comments made by: </td>
 						<td class='control'>
-							".$frm->radio_switch('comments_moderate', $pref['comments_moderate'], LAN_YES, LAN_NO)."
-							<div class='field-help'>Posted comments will require approval before being visible to others</div>
+							".
+							
+							$frm->uc_select('comments_moderate', $pref['comments_moderate'],"nobody,guest,new,bots,public,admin,main,classes").
+							"
+							<div class='field-help'>Comments will require manual approval by an admin prior to being visible to other users</div>
 						</td>
 					</tr>
 					<tr>
diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml
index f0a93a656..6ad408a64 100644
--- a/e107_core/xml/default_install.xml
+++ b/e107_core/xml/default_install.xml
@@ -25,7 +25,7 @@
 		<core name="comments_disabled">0</core>
 		<core name="comments_emoticons">0</core>
 		<core name="comments_icon">0</core>
-		<core name="comments_moderate">0</core>	
+		<core name="comments_moderate">247</core>	
 		<core name="comments_sort">desc</core>				
 		<core name="compress_output">0</core>
 		<core name="contact_emailcopy">0</core>
@@ -64,10 +64,9 @@
 		<core name="e_jslib_gzip">1</core>
 		<core name="e_jslib_nocombine">0</core>
 		<core name="e_jslib_core"><![CDATA[array (
-		  'prototype' => 'none',
-		  'prototype-cdn' => 'none',
-		  'jquery' => 'auto',
-		)]]></core>
+'prototype' => 'none',
+'jquery' => 'auto',
+)]]></core>
 		<core name="e_jslib_plugin"><![CDATA[array ()]]></core>
 		<core name="e_jslib_theme"><![CDATA[array ()]]></core>
 		<core name="email_notify">0</core>
@@ -236,6 +235,7 @@ City, State, Country
 		<core name="user_reg">1</core>
 		<core name="user_reg_secureveri">1</core>
 		<core name="user_reg_veri">1</core>
+		<core name="user_new_period">3</core>
 		<core name="user_tracking">cookie</core>
 		<core name="wmessage_sc">0</core>
 		<core name="wysiwyg">0</core>
diff --git a/e107_files/jslib/core/admin.jquery.js b/e107_files/jslib/core/admin.jquery.js
index 2e6464569..eb3f12fe6 100644
--- a/e107_files/jslib/core/admin.jquery.js
+++ b/e107_files/jslib/core/admin.jquery.js
@@ -78,6 +78,9 @@ $(document).ready(function()
 		// Admin Prefs Navigation
 		
 		 $(".plugin-navigation a").click(function () {
+		 	
+		 //	alert(document.location.hash);
+		 	
 		 	$(".plugin-navigation a").each(function(index) {
     			var ot = $(this).attr("href");
 				$(ot).hide();
diff --git a/e107_handlers/comment_class.php b/e107_handlers/comment_class.php
index 7359c305a..07fd028da 100644
--- a/e107_handlers/comment_class.php
+++ b/e107_handlers/comment_class.php
@@ -615,7 +615,7 @@ class comment
 						'comment_author_email'	=> $tp->toDB($cuser_mail),
 						'comment_datestamp'		=> $_t,
 						'comment_comment'		=> $comment,
-						'comment_blocked'		=> (vartrue($pref['comments_moderate']) ? 2 : 0), 
+						'comment_blocked'		=> (check_class($pref['comments_moderate']) ? 2 : 0), 
 						'comment_ip'			=> $ip,
 						'comment_type'			=> $tp->toDB($type, true),
 						'comment_lock'			=> 0 //Not locked by default