diff --git a/account_prefs_inc.php b/account_prefs_inc.php
index 607469293e..6651d7c31e 100644
--- a/account_prefs_inc.php
+++ b/account_prefs_inc.php
@@ -92,7 +92,16 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
 				<label for="default-project-id"><span><?php echo lang_get( 'default_project' ) ?></span></label>
 				<span class="select">
 					<select id="default-project-id" name="default_project">
-						<?php print_project_option_list( (int)$t_pref->default_project ) ?>
+<?php
+	# Count number of available projects
+	$t_projects = current_user_get_accessible_projects();
+	$t_num_proj = count( $t_projects );
+	if( $t_num_proj == 1 ) {
+		$t_num_proj += count( current_user_get_accessible_subprojects( $t_projects[0] ) );
+	}
+	# Only display "All projects" in selection list if there is more than 1
+	print_project_option_list( (int)$t_pref->default_project, $t_num_proj > 1 );
+?>
 					</select>
 				</span>
 				<span class="label-style"></span>
diff --git a/core/html_api.php b/core/html_api.php
index 555063d1de..6c13685922 100644
--- a/core/html_api.php
+++ b/core/html_api.php
@@ -544,12 +544,10 @@ function html_login_info() {
 	}
 	echo '</div>';
 
-
+	# Project Selector hidden if only one project visisble to user
 	$t_show_project_selector = true;
-	if( count( current_user_get_accessible_projects() ) == 1 ) {
-
-		// >1
-		$t_project_ids = current_user_get_accessible_projects();
+	$t_project_ids = current_user_get_accessible_projects();
+	if( count( $t_project_ids ) == 1 ) {
 		$t_project_id = (int) $t_project_ids[0];
 		if( count( current_user_get_accessible_subprojects( $t_project_id ) ) == 0 ) {
 			$t_show_project_selector = false;
@@ -579,6 +577,14 @@ function html_login_info() {
 		echo '</form>';
 		echo '<div id="current-time">' . $t_now . '</div>';
 	} else {
+		# User has only one project, set it as both current and default
+		if( ALL_PROJECTS == helper_get_current_project() ) {
+			helper_set_current_project( $t_project_id );
+			current_user_set_default_project( $t_project_id );
+			# Force reload of current page
+			$t_redirect_url = str_replace( config_get( 'short_path' ), '', $_SERVER['REQUEST_URI'] );
+			html_meta_redirect( $t_redirect_url, 0, false );
+		}
 		echo '<div id="current-time-centered">' . $t_now . '</div>';
 	}
 }