diff --git a/judge.inc.php b/judge.inc.php
index e6bbe84..14b3a65 100644
--- a/judge.inc.php
+++ b/judge.inc.php
@@ -23,7 +23,7 @@
 */
 ?>
 <?
-
+require_once('user_edit.inc.php');
 $preferencechoices=array(
 	-2=>"Very Low",
 	-1=>"Low",
@@ -58,6 +58,10 @@ function judge_status_expertise(&$u)
 	return 'complete';
 }
 
+function judge_status_availability(&$u){
+	return 'complete';
+}
+
 function judge_status_other(&$u)
 {
 	global $config;
diff --git a/judge_expertise.php b/judge_expertise.php
index 3b0d007..93af69c 100644
--- a/judge_expertise.php
+++ b/judge_expertise.php
@@ -84,15 +84,15 @@ case 'save':
 }
 
 
- if($_SESSION['embed'] == true) {
+// if($_SESSION['embed'] == true) {
 	 echo "<br /><h3>".i18n("Judging Expertise")."</h3>";
 	display_messages();
- } else {
+/* } else {
 	//send the header
 	send_header('Category and Division Preferences', 
  		array('Judge Registration' => 'judge_main.php')
 		);
- }
+ }*/
 
 $newstatus=judge_status_expertise($u);
 ?>
@@ -225,6 +225,6 @@ echo "<input type=\"hidden\" name=\"users_id\" value=\"{$u['id']}\">\n";
 </form>
 
 <?
- if($_SESSION['embed'] != true) send_footer();
+// if($_SESSION['embed'] != true) send_footer();
 
 ?>
diff --git a/judge_main.php b/judge_main.php
index 4c728fd..c0cd7dc 100644
--- a/judge_main.php
+++ b/judge_main.php
@@ -86,20 +86,20 @@
 
  user_page_summary_begin();
  user_page_summary_item("Contact Information", 
-	"user_personal.php", "user_personal_info_status", array($u));
+	"user_personal.php", "user_personal_info_status", array(&$u));
  user_page_summary_item("Other Information", 
-	"judge_other.php", "judge_status_other", array($u));
+	"judge_other.php", "judge_status_other", array(&$u));
  user_page_summary_item("Areas of Expertise", 
-	"judge_expertise.php", "judge_status_expertise", array($u));
+	"judge_expertise.php", "judge_status_expertise", array(&$u));
 
  if($config['judges_availability_enable'] == 'yes') {
 	 user_page_summary_item("Time Availability", 
-		"judge_availability.php", "judge_status_availability", array($u));
+		"judge_availability.php", "judge_status_availability", array(&$u));
  }
 
  if($config['judges_specialaward_enable'] == 'yes' || $u['special_award_only'] == 'yes') {
 	user_page_summary_item("Special Award Preferences", 
-		"judge_special_awards.php", "judge_status_special_awards", array($u));
+		"judge_special_awards.php", "judge_status_special_awards", array(&$u));
 	}
 //	user_page_summary_item("Areas of Expertise", 
  //		"register_judges_expertise.php", "expertiseStatus", array($u));
diff --git a/judge_special_awards.php b/judge_special_awards.php
index 3bbc308..f87d77d 100644
--- a/judge_special_awards.php
+++ b/judge_special_awards.php
@@ -57,16 +57,16 @@ case 'save':
 	exit;
  }
 
- if($_SESSION['embed'] == true) {
+// if($_SESSION['embed'] == true) {
 	display_messages();
 	echo "<br /><h3>".i18n('Special Awards')."</h3>";
  	echo "<br />";
- } else {
+/* } else {
 	//send the header
 	send_header('Special Awards', 
  		array('Judge Registration' => 'judge_main.php')
 		);
- }
+ }*/
 ?>
 <script type="text/javascript">
 function judgespecialawards_save()
@@ -150,5 +150,5 @@ if($_SESSION['embed'] != true) {
 </form>
 
 <?
- if($_SESSION['embed'] != true) send_footer();
+// if($_SESSION['embed'] != true) send_footer();
 ?>
diff --git a/user_edit.php b/user_edit.php
index cff2278..6534602 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -126,19 +126,16 @@ $tabs = array(	'fairinfo' => array(
 			'label' => 'Expertise',
 			'types' => array('judge'),
 			'file' => 'judge_expertise.php',
-			'disabled' => true,
 			),
 		'judgeavailability' => array(
 			'label' => 'Time Avail.',
 			'types' => array('judge'),
 			'file' => 'judge_availability.php',
-			'disabled' => true,
 			),
 		'judgesa' => array(
 			'label' => 'Special Awards',
 			'types' => array('judge'),
 			'file' => 'judge_special_awards.php',
-			'disabled' => true,
 			),
 		'volunteerpos' => array(
 			'label' => 'Volunteer Positions',
@@ -323,10 +320,12 @@ foreach($tabs as $k=>$t) {
 var stat = new Array();
 <?
 /* An array of all tabs and current status for each one */
+$tally = 0;
 foreach($tabs as $k=>$t) {
 	/* Enabled has been modified now for this user */
 	if($t['disabled'] == true) continue;
-	if($t['index'] != 1) echo ", ";
+	if($tally != 0) echo ", ";
+	$tally++;
 	echo "stat['$k'] = '{$t['status']}'\n";
 }
 ?>