diff --git a/account_prefs_page.php3 b/account_prefs_page.php3
index 37bfb5784a..3bc3caed04 100644
--- a/account_prefs_page.php3
+++ b/account_prefs_page.php3
@@ -83,6 +83,17 @@
 			<input type=checkbox name=f_advanced_view <? if ( $u_advanced_view=="on" ) echo "CHECKED"?>
 		</td>
 	</tr>
+	<tr bgcolor=<? echo $g_primary_color_light ?>>
+		<td>
+			<? echo $s_default_project ?>
+		</td>
+		<td>
+			<select name=f_project_id>
+				<option value="0000000">
+				<? print_project_option_list( $u_default_project_id  ) ?>
+			</select>
+		</td>
+	</tr>
 	<tr align=center>
 		<td>
 			<input type=submit value="<? echo $s_update_prefs_button ?>">
diff --git a/account_prefs_reset.php3 b/account_prefs_reset.php3
index 2c8c4f1319..1826598462 100644
--- a/account_prefs_reset.php3
+++ b/account_prefs_reset.php3
@@ -12,7 +12,8 @@
 	## reset to defaults
 	$query = "UPDATE $g_mantis_user_pref_table
 			SET advanced_report='$g_default_advanced_report',
-				advanced_view='$g_default_advanced_view'
+				advanced_view='$g_default_advanced_view',
+				default_project_id=''
 			WHERE id='$f_id'";
 	$result = db_query( $query );
 ?>
diff --git a/account_prefs_update.php3 b/account_prefs_update.php3
index 6dfc5f2479..fb2f37a8b7 100644
--- a/account_prefs_update.php3
+++ b/account_prefs_update.php3
@@ -12,7 +12,8 @@
 	## update preferences
 	$query = "UPDATE $g_mantis_user_pref_table
 			SET advanced_report='$f_advanced_report',
-				advanced_view='$f_advanced_view'
+				advanced_view='$f_advanced_view',
+				default_project_id='$f_project_id'
 			WHERE id='$f_id'";
 	$result = db_query( $query );
 ?>
diff --git a/config_inc.php b/config_inc.php
index 99c3e8c481..5551b0cdce 100644
--- a/config_inc.php
+++ b/config_inc.php
@@ -162,10 +162,6 @@
 	$g_view_reported_cookie_val       = $HTTP_COOKIE_VARS[$g_view_reported_cookie];
 	$g_view_assigned_cookie_val       = $HTTP_COOKIE_VARS[$g_view_assigned_cookie];
 	#--------------------
-	if ( empty( $g_project_cookie_val ) ) {
-		$g_project_cookie_val = "0000000";
-	}
-	#--------------------
 
 	#--------------------
 	# database table names
diff --git a/core_API.php b/core_API.php
index 21e53388ae..51ddedff35 100644
--- a/core_API.php
+++ b/core_API.php
@@ -170,16 +170,16 @@ function print_login_info() {
 		$t_username = get_current_user_field( "username" );
 		$t_now = date($g_complete_date_format);
 		PRINT "<table width=100%><tr>";
-		PRINT "<td align=left width=25%>";
+		PRINT "<td align=left width=33%>";
 			PRINT "$s_logged_in_as: <i>$t_username</i>";
 		PRINT "</td>";
-		PRINT "<td align=center width=50%>";
+		PRINT "<td align=center width=34%>";
 			PRINT "<i>$t_now</i>";
 		PRINT "</td>";
-		PRINT "<td align=right width=25%>";
+		PRINT "<td align=right width=33%>";
 			PRINT "<form method=post action=$g_set_project>";
 			PRINT "<select name=f_project_id>";
-				print_projects_option_list( $g_project_cookie_val );
+				print_project_option_list( $g_project_cookie_val );
 			PRINT "</select>";
 			PRINT "<input type=submit value=\"$s_switch\">";
 		PRINT "</td>";
@@ -442,7 +442,7 @@ function print_assign_to_option_list() {
 		} ### end for
 	}
 	### --------------------
-	function print_projects_option_list( $p_project_id="" ) {
+	function print_project_option_list( $p_project_id="" ) {
 		global $g_mantis_project_table,
 				$g_project_cookie_val;
 
diff --git a/login.php3 b/login.php3
index 72e88087f5..61b9375ad2 100644
--- a/login.php3
+++ b/login.php3
@@ -36,10 +36,12 @@
 		### set permanent cookie (1 year)
 		if ( $f_perm_login=="on") {
 			setcookie( $g_string_cookie, $u_cookie_string, time()+$g_cookie_time_length );
+			setcookie( $g_project_cookie, $f_project_id, time()+$g_cookie_time_length );
 		}
 		### set temp cookie, cookie dies after browser closes
 		else {
 			setcookie( $g_string_cookie, $u_cookie_string );
+			setcookie( $g_project_cookie, $f_project_id );
 		}
 
 		header( "Location: $g_main_page" );
diff --git a/login_page.php3 b/login_page.php3
index 67d7744546..25a0fd3724 100644
--- a/login_page.php3
+++ b/login_page.php3
@@ -5,6 +5,9 @@
 	# See the README and LICENSE files for details
 ?>
 <? include( "core_API.php" ) ?>
+<?
+	db_connect( $g_hostname, $g_db_username, $g_db_password, $g_database_name );
+?>
 <? print_html_top() ?>
 <? print_head_top() ?>
 <? print_title( $g_window_title ) ?>
@@ -51,6 +54,16 @@
 			<input type=checkbox name=f_perm_login>
 		</td>
 	</tr>
+	<tr bgcolor=<? echo $g_primary_color_light ?>>
+		<td>
+			<? echo $s_choose_project ?>:
+		</td>
+		<td>
+			<select name=f_project_id>
+			<? print_project_option_list() ?>
+			</select>
+		</td>
+	</tr>
 	<tr>
 		<td align=center colspan=2>
 			<input type=submit value="<? echo $s_login_button ?>">
diff --git a/strings_english.php b/strings_english.php
index d46481cae6..64c3c94dcc 100644
--- a/strings_english.php
+++ b/strings_english.php
@@ -48,6 +48,7 @@
 	$s_default_account_preferences_title = "Default Account Preferences";
 	$s_advanced_report = "Advanced Report";
 	$s_advanced_view = "Advanced View";
+	$s_default_project = "Default Project";
 	$s_update_prefs_button = "Update Prefs";
 	$s_reset_prefs_button = "Reset Prefs";
 
@@ -223,6 +224,7 @@
 	### $s_username # defined above
 	### $s_password # defined above
 	### $s_save_login # defined above
+	$s_choose_project = "Choose Project";
 	### $s_login_button # defined above
 	$s_signup_link = "signup for a new account";