diff --git a/common.inc.php b/common.inc.php
index 8b900404..29272aa8 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -139,11 +139,9 @@ if(!$_SESSION['conferences_id']) {
 if(isset($_SESSION['roles']) && $_SESSION['username']) {
 	echo i18n("Logged in as %1",array($_SESSION['username']))."<br />";
 	echo "<div style=\"margin-top: 8px;\">\n";
-	echo "My: <a href=\"{$config['SFIABDIRECTORY']}/user_account.php\">".i18n("Account")."</a>";
+	echo "My: <a href=\"{$config['SFIABDIRECTORY']}/user_edit.php\">".i18n("Account Profile")."</a>";
 	echo "&nbsp;|&nbsp;";
-	echo "<a href=\"{$config['SFIABDIRECTORY']}/user_personal.php\">".i18n("Profile")."</a>";
-	echo "&nbsp;|&nbsp;";
-	echo "<a href=\"{$config['SFIABDIRECTORY']}/user_main.php\">".i18n("Main")."</a>";
+	echo "<a href=\"{$config['SFIABDIRECTORY']}/user_main.php\">".i18n("Main Page")."</a>";
 	echo "</div>";
 	echo "<div style=\"margin-top: 5px;\">\n";
 	echo "<a href=\"{$config['SFIABDIRECTORY']}/user_login.php?action=logout\">".i18n("Logout")."</a>";
@@ -376,12 +374,14 @@ if(is_array($_SESSION['roles'])) {
 		admin_warnings();
 }
 
+/*
 if(substr(getcwd(),-6)!="/admin" && substr(getcwd(),-7)!="/config" && substr(getcwd(),-6)!="/super") {
 ?>
 	<div id="importantdatesbox">
 	</div>
 <?
 }
+*/
 
 if($icon && theme_icon($icon)) {
 	echo "<div style=\"float: left; margin-right: 5px;\">";
diff --git a/user.inc.php b/user.inc.php
index 6724ead7..b399de62 100644
--- a/user.inc.php
+++ b/user.inc.php
@@ -548,7 +548,7 @@ function user_auth_required($all_required = array(), $one_required = array())
 	/* Forward to password expired, remember the target URI */
 	if($_SESSION['password_expired'] == true) {
 		$_SESSION['request_uri'] = $_SERVER['REQUEST_URI'];
-		header("location: {$config['SFIABDIRECTORY']}/user_account.php");
+		header("location: {$config['SFIABDIRECTORY']}/user_edit.php");
 		exit;
 	}
 
diff --git a/user_login.php b/user_login.php
index 018ee95d..c3680ccf 100644
--- a/user_login.php
+++ b/user_login.php
@@ -73,7 +73,7 @@ function user_conference_load($accounts_id,$conferences_id) {
 	$q = mysql_query("SELECT id FROM users WHERE accounts_id=$accounts_id AND conferences_id=$conferences_id");
 	if(mysql_num_rows($q) == 0) {
 		/* FIXME: this should probably just return false, but for now, see if there's an error */
-		header("location: user_account.php");
+		header("location: user_edit.php");
 //		echo "No user {$accounts_id} for conference {$_SESSION['conferences_id']}";
 		exit;
 	}