diff --git a/judge.class.php b/judge.class.php
index c8a1d276..81b6fb10 100644
--- a/judge.class.php
+++ b/judge.class.php
@@ -1,6 +1,29 @@
 <?
 
 
+$judges_fields = array(	'firstname' => 'First Name',
+			'lastname' => 'Last Name',
+			'email' => 'Email Address',
+			'password' => 'Password',
+			'passwordexpiry' => 'Password Expiry',
+			'phonehome' => 'Phone (Home)',
+			'phonecell' => 'Phone (Cell)',
+			'phonework' => 'Phone (Work)',
+			'phoneworkext' => 'Phone Ext. (Work)',
+			'organization' => 'Organization',
+			'created' => 'Created',
+			'lastlogin' => 'Last Login',
+			'address' =>"Address 1",
+			'address2' =>"Address 2",
+			'city' => 'City',
+			'province' => 'Province',
+			'postalcode' => 'Postal Code',
+			'deleted' => 'Deleted',
+			'deleteddatetime' => 'Deleted Date/Time',
+			'expertise_other' => 'Other Expertise/Notes',
+			'complete' => "Complete");
+
+
 
 class person {
 	var $id;
@@ -38,19 +61,10 @@ function tableEditorSetup($editor)
 
 	/* Most of these should be moved to the base class, as they
 	 * will be the same for all person groups */
-	$e = array(	'firstname' => 'First Name',
-			'lastname' => 'Last Name',
-			'email' => 'Email Address',
-			'address' =>"Address 1",
-			'address2' =>"Address 2",
-			'city' => 'City',
-			'province' => 'Province',
-			'postalcode' => 'Postal Code',
-			'phonework' => 'Phone (Work)',
-			'phonecell' => 'Phone (Cell)',
-			'organization' => 'Organization',
-			'language' => 'Language(s)',
-			'complete' => "Complete" );
+	$e = array_merge($judges_fields, 
+		array(	'language' => 'Language(s)',
+					
+			));
 	
 	$editor->setTable('judges');
 	$editor->setListFields($l);
@@ -109,18 +123,7 @@ function tableEditorLoad()
 
 function tableEditorSave($data)
 {
-	$judges_fields = array(	'firstname' => 'First Name',
-			'lastname' => 'Last Name',
-			'email' => 'Email Address',
-			'address' =>"Address 1",
-			'address2' =>"Address 2",
-			'city' => 'City',
-			'province' => 'Province',
-			'postalcode' => 'Postal Code',
-			'phonework' => 'Phone (Work)',
-			'phonecell' => 'Phone (Cell)',
-			'organization' => 'Organization',
-			'complete' => "Complete" );
+	global $judges_fields;
 
 	$query = "";