diff --git a/user_password.php b/user_password.php
index 9218fbe..74faefc 100644
--- a/user_password.php
+++ b/user_password.php
@@ -40,23 +40,6 @@
 
  $notice=$_GET['notice'];
 
- switch($type) {
- case 'volunteer':
-	$what = "Volunteer";
- 	break;
- case 'committee':
-	$what = "Committee Member";
-	break;
- case 'judge':
-	$what = "Judge";
-	break;
- case 'student':
-	$what = "Participant";
-	break;
- default:
- 	exit;
- }
-
  $back_link = "{$type}_main.php";
  $password_expiry_days = $config["{$type}_password_expiry_days"];
 
@@ -81,13 +64,16 @@
 		if($_SESSION['password_expired'])
 		{
 			unset($_SESSION['password_expired']);
-			header("location: $back_link?notice=password_changed");
-			exit;
 		}
+
+		header("location: $back_link?notice=password_changed");
+		exit;
 	}
  }
 
- send_header("$what - Change Password");
+ send_header("{$user_what[$type]} - Change Password",
+                  array("{$user_what[$type]} Registration" => "{$type}_main.php")
+		                  );
 
  if($_SESSION['password_expired'] == true)
  {