diff --git a/committees.php b/committees.php
index 55211b9..c5b4237 100644
--- a/committees.php
+++ b/committees.php
@@ -111,5 +111,8 @@
 	}
 	echo "</table>";
 
+	echo "<br />";
+	echo "<a href=\"contact.php\">".i18n("Contact a committee member")."</a>";
+
 	send_footer();
 ?>
diff --git a/common.inc.php b/common.inc.php
index 0978f56..539d39c 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -557,7 +557,9 @@ if(count($config['languages'])>1)
 	echo "</form>";
 }
 
-
+echo "<br /><ul class=\"mainnav\">\n";
+echo "<li><a href=\"{$config["SFIABDIRECTORY"]}/contact.php\">".i18n("Contact Us")."</a></li>\n";
+echo "</ul>";
 ?>
 </div>
 
diff --git a/contact.php b/contact.php
new file mode 100644
index 0000000..1f880aa
--- /dev/null
+++ b/contact.php
@@ -0,0 +1,120 @@
+<?
+/* 
+   This file is part of the 'Science Fair In A Box' project
+   SFIAB Website: http://www.sfiab.ca
+
+   Copyright (C) 2007 James Grant <james@lightbox.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation, version 2.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+?>
+<?
+ require("common.inc.php");
+ send_header("Contact", array());
+
+ function cleanify($in) {
+ 	$in=ereg_replace("\r","\n",$in);
+ 	$lines=split("\n",$in);
+	return trim($lines[0]);
+ }
+
+ if($_POST['action']=="send") {
+ 	if($_POST['to'] && $_POST['subject'] && $_POST['message'] && $_POST['from'] && $_POST['fromemail']) {
+		if(isEmailAddress($_POST['fromemail'])) {
+			list($id,$md5email)=split(":",$_POST['to']);
+			$q=mysql_query("SELECT * FROM users WHERE id='$id'");
+			$r=mysql_fetch_object($q);
+			//if a valid selection is made from the list, then this will always match.
+			if($md5email == md5($r->email)) {
+				$from=cleanify($_POST['from'])." <".cleanify($_POST['fromemail']).">";
+				$extra="Return-Path: $from\r\nFrom: $from\r\nReply-To: $from\r\n"; 
+				mail("$r->firstname $r->lastname <$r->email>",$_POST['subject'],$_POST['message'],$extra);
+				echo happy(i18n("Contact email successfully sent"));
+			}
+			else {
+				//this should never happen unless a spammer us auto-submitting stuff and it doesnt match.
+				echo error(i18n("Invalid email address"));
+			}
+		}	
+		else
+			echo error(i18n("Please enter a valid email address"));
+	}
+	else
+		echo error(i18n("All fields are required"));
+ }
+
+?>
+<script type="text/javascript">
+function tochange() {
+	if(!document.forms.contactform.to.options[document.forms.contactform.to.selectedIndex].value)
+		document.forms.contactform.to.selectedIndex=0;
+}
+</script>
+<?
+
+	echo i18n("Choose who you would like to contact from the list below, type your subject and message, and click the 'Send' button");
+	echo "<br />";
+	echo "<br />";
+	echo "<form name=\"contactform\" method=\"post\" action=\"contact.php\">\n";
+	echo "<input type=\"hidden\" name=\"action\" value=\"send\">\n";
+	echo "<table class=\"tableedit\">";
+	echo "<tr><td>".i18n("To").":</td>";
+	echo "<td><select name=\"to\" onchange=\"tochange()\">";
+	echo "<option value=\"\">".i18n("Choose a person to contact")."</option>\n";
+	$q=mysql_query("SELECT * FROM committees ORDER BY ord,name");
+	while($r=mysql_fetch_object($q))
+	{
+		$q2=mysql_query("SELECT
+					users.id,
+					users.firstname,users.lastname,
+					users.email,
+					committees_link.title, 
+					committees_link.ord 
+				FROM 
+					users, users_committee, committees_link 
+				WHERE 
+					users_committee.users_id=users.id
+					AND committees_link.users_id=users.id 
+					AND committees_link.committees_id='$r->id'
+				ORDER BY 
+				 	ord,firstname");
+		
+		//if there's nobody in this committee, then just skip it and go on to the next one.
+		if(mysql_num_rows($q2)==0)
+			continue;
+
+		echo "<option value=\"\">$r->name</option>\n";
+
+		echo mysql_error();
+		while($r2=mysql_fetch_object($q2))
+		{
+			if($r2->email) {
+				$name=$r2->firstname.' '.$r2->lastname;
+				if($r2->title) $titlestr=" ($r2->title)"; else $titlestr="";
+				echo "<option value=\"$r2->id:".md5($r2->email)."\">&nbsp;&nbsp;-{$name}{$titlestr}</option>\n";
+			}
+		}
+	}
+	echo "</select></td></tr>";
+	echo "<tr><td>".i18n("Your Name").":</td><td><input type=\"text\" name=\"from\" size=\"50\"></td></tr>";
+	echo "<tr><td>".i18n("Your Email Address").":</td><td><input type=\"text\" name=\"fromemail\" size=\"50\"></td></tr>";
+	echo "<tr><td>".i18n("Subject").":</td><td><input type=\"text\" name=\"subject\" size=\"50\"></td></tr>";
+	echo "<tr><td>".i18n("Message").":</td><td><textarea cols=\"50\" rows=\"6\" name=\"message\"></textarea></td></tr>";
+	echo "<tr><td></td><td align=\"center\"><input type=\"submit\" value=\"".i18n("Send")."\"></td></tr>";
+	echo "</table>";
+	echo "</form>";
+
+	send_footer();
+?>
diff --git a/db/db.code.version.txt b/db/db.code.version.txt
index 85322d0..d15a2cc 100644
--- a/db/db.code.version.txt
+++ b/db/db.code.version.txt
@@ -1 +1 @@
-79
+80
diff --git a/db/db.update.80.sql b/db/db.update.80.sql
new file mode 100644
index 0000000..cf122dd
--- /dev/null
+++ b/db/db.update.80.sql
@@ -0,0 +1,2 @@
+INSERT INTO `pagetext` ( `id` , `textname` , `text` , `year` , `lastupdate` ) VALUES ( '', 'register_volunteer_invite', 'Thank you for volunteering for the fair.  Volunteer registration is by invitation only.<br /><br />Please contact the fair and request to be invited as a volunteer.  We will then send you an email with instructions on how to complete your volunteer registration.<br /><br />If you have been invited already, you need to login using the same email address that you were invited with.', '-1', '');
+
diff --git a/user_new.php b/user_new.php
index 601c16d..749c67f 100644
--- a/user_new.php
+++ b/user_new.php
@@ -99,10 +99,7 @@
  	send_header("{$user_what[$type]} Registration",
 		array("{$user_what[$type]} Login" => "user_login.php?type=$type") );
 
-	echo i18n("{$user_what[$type]} Registration is by invitation only.  You can not create a new account.")."<br /><br />";
-	echo i18n("In order to register you must have your account created for you by the science fair committee.")."<br /><br />";
-	echo i18n("Once your account is created you'll be invited via email to login and complete your {$user_what[$type]} registration information.	If you have been invited already, you need to use login using the email address that you were invited with.  If you need an invitation, please contact the science fair committee by sending us an email:  <a href=\"mailto:%2\">%1</a>.",
-		array($config['fairname'],$config['fairmanageremail']));
+	output_page_text("register_{$type}_invite");
 	echo "<br />";
 	send_footer();
 	exit;
diff --git a/version.txt b/version.txt
index 399088b..04b10b4 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.1.6
+2.1.7