diff --git a/committee_main.php b/committee_main.php
index bff234d..c9681e9 100644
--- a/committee_main.php
+++ b/committee_main.php
@@ -51,7 +51,7 @@
  //these can exist without knowing which conference
  echo " <tr>\n";
  echo "  <td><a href=\"user_personal.php\">".theme_icon("edit_profile")."<br />".i18n("Edit My Profile")."</a></td>";
- echo "  <td><a href=\"user_password.php\">".theme_icon("change_password")."<br />".i18n("Change My Password")."</a></td>";
+ echo "  <td><a href=\"user_account.php\">".theme_icon("change_password")."<br />".i18n("Change My Email, Username, and, Password")."</a></td>";
  echo "  <td><a href=\"user_activate.php\">".theme_icon("manage_roles")."<br />".i18n("Manage My Roles")."</a></td>";
  echo " </tr>\n";
  echo "</table>\n";
diff --git a/fair_main.php b/fair_main.php
index 0cffb11..6d024e9 100644
--- a/fair_main.php
+++ b/fair_main.php
@@ -58,7 +58,7 @@
  echo "<table class=\"adminconfigtable\">";
  echo " <tr>\n";
  echo "  <td><a href=\"user_personal.php\">".theme_icon("edit_profile")."<br />".i18n("Edit My Profile")."</a></td>";
- echo "  <td><a href=\"user_password.php\">".theme_icon("change_password")."<br />".i18n("Change My Password")."</a></td>";
+ echo "  <td><a href=\"user_account.php\">".theme_icon("change_password")."<br />".i18n("Change My Email, Username, and, Password")."</a></td>";
  echo "  <td><a href=\"user_activate.php\">".theme_icon("manage_roles")."<br />".i18n("Manage My Roles")."</a></td>";
  echo " </tr>\n";
  echo "</table>\n";
diff --git a/judge_main.php b/judge_main.php
index 6fe35ea..4c728fd 100644
--- a/judge_main.php
+++ b/judge_main.php
@@ -119,7 +119,7 @@
  echo i18n('Other Options and Things To Do').':<br />';
  echo '<ul>';
  echo '<li><a href="judge_schedule.php">'.i18n('Check the Judging Schedule').'</a> - '.i18n('Look at the judging team(s) you have been assigned to, and the projects you will judge.').'</li>';
- echo '<li><a href="user_password.php">'.i18n('Change Password').'</a> - '.i18n('Change your password').'</li>';
+ echo '<li><a href="user_account.php">'.i18n('Change Password').'</a> - '.i18n('Change your email, username, and password').'</li>';
  echo '<li><a href="user_activate.php">'.i18n('Activate/Deactivate Role').'</a> - '.
 		i18n('Activate/Deactiate/Remove/Delete roles or your entire account').
 		'</li>';
diff --git a/sponsor_main.php b/sponsor_main.php
index 8b827d6..ecb2cf0 100644
--- a/sponsor_main.php
+++ b/sponsor_main.php
@@ -43,7 +43,7 @@
  echo "<table class=\"adminconfigtable\">";
  echo " <tr>\n";
  echo "  <td><a href=\"user_personal.php\">".theme_icon("edit_profile")."<br />".i18n("Edit My Profile")."</a></td>";
- echo "  <td><a href=\"user_password.php\">".theme_icon("change_password")."<br />".i18n("Change My Password")."</a></td>";
+ echo "  <td><a href=\"user_account.php\">".theme_icon("change_password")."<br />".i18n("Change My Email, Usernamne, and Password")."</a></td>";
 // echo "  <td><a href=\"user_activate.php\">".theme_icon("")."<br />".i18n("Manage My Roles")."</a></td>";
  echo " </tr>\n";
  echo "</table>\n";
diff --git a/user_main.php b/user_main.php
index 27fbbe3..1634486 100644
--- a/user_main.php
+++ b/user_main.php
@@ -52,7 +52,7 @@
  echo "<br />";
  echo i18n('Other Options and Things To Do').':<br />';
  echo '<ul>';
- echo '<li><a href="user_password.php">'.i18n('Change Password').'</a> - '.i18n('Change your password').'</li>';
+ echo '<li><a href="user_account.php">'.i18n('Change Password').'</a> - '.i18n('Change your email, username, and password').'</li>';
  echo '<li><a href="user_activate.php">'.i18n('Activate/Deactivate Roles').'</a> - '.
 		i18n('Activate/Deactiate/Remove/Delete roles or your entire account').
 		'</li>';
diff --git a/user_password.php b/user_password.php
deleted file mode 100644
index 2a05650..0000000
--- a/user_password.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?
-/* 
-   This file is part of the 'Science Fair In A Box' project
-   SFIAB Website: http://www.sfiab.ca
-
-   Copyright (C) 2005 Sci-Tech Ontario Inc <info@scitechontario.org>
-   Copyright (C) 2005 James Grant <james@lightbox.org>
-   Copyright (C) 2007 David Grant <dave@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_once("common.inc.php");
- require_once("account.inc.php");
-
- /* Make sure the user is logged in  (accounts_id is set) */
- if(!isset($_SESSION['accounts_id'])) {
-	message_push(error(i18n("You must login to view that page")));
- 	header("location: {$config['SFIABDIRECTORY']}/index.php");
- 	exit;
- }
-
-
- if(array_key_exists('request_uri', $_SESSION))
- 	$back_link = $_SESSION['request_uri'];
- else 
-	$back_link = "user_main.php";
- unset($_SESSION['request_uri']);
-
- if($_POST['action']=="save") {
-	$pass = mysql_escape_string($_POST['pass1']);
- 	//first, lets see if they choose the same password again (bad bad bad)
-	$q=mysql_query("SELECT password FROM accounts WHERE 
-				id='{$_SESSION['accounts_id']}' 
-				AND password='$pass'");
-
-	if(mysql_num_rows($q))
-		message_push(error(i18n("You cannot choose the same password again.  Please choose a different password")));
-	else if(!$_POST['pass1']) 
-		message_push(error(i18n("New Password is required")));
-	else if($_POST['pass1'] != $_POST['pass2']) 
-		message_push(error(i18n("Passwords do not match")));
-	else if(account_valid_password($_POST['pass1']) == false) 
-		message_push(error(i18n("The password contains invalid characters or is not long enough")));
-	else {
-		account_set_password($_SESSION['accounts_id'], $pass);
-		unset($_SESSION['password_expired']);
-
-		message_push(happy(i18n('Your password has been successfully updated')));
-		header("location: $back_link");
-		exit;
-	}
- }
-
- send_header("Change Password",
-                  array("Main" => "user_main.php")
-				  ,"change_password"
-		                  );
-
- if($_SESSION['password_expired'] == true)
- {
- 	echo i18n('Your password has expired.  You must choose a new password now.');
- }
-
- echo "<form name=\"changepassform\" method=\"post\" action=\"user_password.php\">\n";
- echo "<input type=\"hidden\" name=\"action\" value=\"save\" />\n";
- echo "<table>\n";
-
-		echo "<br />";
-		echo "<table>";
-		echo "<tr><td>";
-		echo i18n("Enter New Password:");
-		echo "</td><td>";
-		echo "<input type=\"password\" size=\"10\" name=\"pass1\">";
-		echo "</td></tr>";
-		echo "<tr><td>";
-		echo i18n("Confirm New Password:");
-		echo "</td><td>";
-		echo "<input type=\"password\" size=\"10\" name=\"pass2\">";
-		echo "</td></tr>";
-
-echo "</table>";
-echo "<input type=\"submit\" value=\"".i18n("Change Password")."\" />\n";
-echo "</form>";
-echo "<br />";
-echo "<div style=\"font-size: 0.75em;\">".i18n('Passwords must be be between 6 and 32 characters, and may NOT contain any quote or a backslash.')."</div>";
-
-
-send_footer();
-?>
diff --git a/volunteer_main.php b/volunteer_main.php
index 1a95fd2..38d29f1 100644
--- a/volunteer_main.php
+++ b/volunteer_main.php
@@ -73,7 +73,7 @@
  echo "<br />";
  echo i18n('Other Options and Things To Do').':<br />';
  echo '<ul>';
- echo '<li><a href="user_password.php">'.i18n('Change Password').'</a> - '.i18n('Change your password').'</li>';
+ echo '<li><a href="user_account.php">'.i18n('Change Password').'</a> - '.i18n('Change your email, username, and password').'</li>';
  echo '<li><a href="user_activate.php">'.i18n('Activate/Deactivate Roles').'</a> - '.
 		i18n('Activate/Deactiate/Remove/Delete roles or your entire account').
 		'</li>';