diff --git a/common.inc.php b/common.inc.php
index 0db97eb0..d94e30f4 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -591,7 +591,16 @@ if(is_array($nav)) {
 ?>
 <ul class="mainnav">
 <?
- echo "<li><a href=\"{$config['SFIABDIRECTORY']}/index.php\">".i18n("Home").'</a></li>';
+ if ($config['website']) {
+	if ($config['website_name']) {
+		echo "<li><a href=\"{$config['website']}\">{$config['website_name']}</a></li>";
+	} else {
+		echo "<li><a href=\"{$config['website']}\">".i18n("Fair Home").'</a></li>';
+	}
+	echo "<li><a href=\"{$config['SFIABDIRECTORY']}/index.php\">".i18n("Registration Home").'</a></li>';
+} else {
+	echo "<li><a href=\"{$config['SFIABDIRECTORY']}/index.php\">".i18n("Home").'</a></li>';
+}
  echo "<li><a href=\"{$config['SFIABDIRECTORY']}/important_dates.php\">".i18n("Important Dates").'</a></li>';
  echo $registrationconfirmationlink;
  /*
diff --git a/db/db.code.version.txt b/db/db.code.version.txt
index 6bb2f98f..0f11735f 100644
--- a/db/db.code.version.txt
+++ b/db/db.code.version.txt
@@ -1 +1 @@
-195
+196
diff --git a/db/db.update.196.sql b/db/db.update.196.sql
new file mode 100644
index 00000000..67eb9c5c
--- /dev/null
+++ b/db/db.update.196.sql
@@ -0,0 +1 @@
+INSERT INTO `config` ( `var` , `val` , `category` , `type` , `type_values` , `ord` , `description` , `section`, `conferencetypes`, `conferences_id`, `year`) VALUES ( 'website', '', 'Global', 'text', '', '800', 'Your organization\'s website', 'conference', 'sciencefair,scienceolympics', '-1', '-1'), ( 'website_name', '', 'Global', 'text', '', '801', 'The name for your organization\'s website. This is only used if a website is entered.', 'conference', 'sciencefair,scienceolympics', '-1', '-1');