diff --git a/db_upgrade.sql b/db_upgrade.sql
index 10a9164ea3..78f3188148 100644
--- a/db_upgrade.sql
+++ b/db_upgrade.sql
@@ -76,7 +76,8 @@ CREATE TABLE mantis_project_table (
    view_state set('public','private') DEFAULT 'public' NOT NULL,
    description text NOT NULL,
    PRIMARY KEY (id),
-   KEY id (id)
+   KEY id (id),
+   UNIQUE name (name)
 );
 
 INSERT INTO mantis_project_table VALUES ( '0000001', 'mantis', 'development', 'on', 'public', 'Mantis.  Report problems with the actual bug tracker here. (Do not remove this account.  You can set it to be disabled if you do not wish to see it)');
@@ -107,9 +108,10 @@ ALTER TABLE mantis_news_table ADD project_id INT (7) UNSIGNED ZEROFILL not null
 # make changes to bug_table
 
 ALTER TABLE mantis_bug_table CHANGE category category VARCHAR (32) not null;
-ALTER TABLE mantis_bug_table CHANGE version version VARCHAR (32) DEFAULT 'none' not null
+ALTER TABLE mantis_bug_table CHANGE version version VARCHAR (32) DEFAULT 'none' not null;
 
 # make changes to user_table
 
 ALTER TABLE mantis_user_table ADD login_count INT not null DEFAULT '0' AFTER access_level;
-ALTER TABLE mantis_user_table CHANGE access_level access_level ENUM ('viewer','reporter','updater','developer','manager','administrator') DEFAULT 'viewer' not null 
\ No newline at end of file
+ALTER TABLE mantis_user_table CHANGE access_level access_level ENUM ('viewer','reporter','updater','developer','manager','administrator') DEFAULT 'viewer' not null;
+ALTER TABLE mantis_user_table ADD UNIQUE(username);
\ No newline at end of file
diff --git a/login_error_page.php3 b/login_error_page.php3
index 14df8ca8b3..e26deec9e7 100644
--- a/login_error_page.php3
+++ b/login_error_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 ) ?>
@@ -54,6 +57,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 7f022130f0..11cbcd225a 100644
--- a/strings_english.php
+++ b/strings_english.php
@@ -221,6 +221,7 @@
 	### $s_username # defined above
 	### $s_password # defined above
 	$s_save_login = "Save Login";
+	### $s_choose_project # defined above
 	$s_login_button = "Login";
 
 	### login_page.php3