diff --git a/tracks/app/controllers/projects_controller.rb b/tracks/app/controllers/projects_controller.rb
index 4fd22e59..9fc59708 100644
--- a/tracks/app/controllers/projects_controller.rb
+++ b/tracks/app/controllers/projects_controller.rb
@@ -136,6 +136,7 @@ class ProjectsController < ApplicationController
         @active_projects = @projects.select{ |p| p.active? }
         @hidden_projects = @projects.select{ |p| p.hidden? }
         @completed_projects = @projects.select{ |p| p.completed? }
+        @new_project = @user.projects.build
         render
       end
     end
diff --git a/tracks/app/controllers/todos_controller.rb b/tracks/app/controllers/todos_controller.rb
index 391b7dec..1a862639 100644
--- a/tracks/app/controllers/todos_controller.rb
+++ b/tracks/app/controllers/todos_controller.rb
@@ -65,8 +65,10 @@ class TodosController < ApplicationController
     end
     
     @saved = @todo.save
-    @todo.tag_with(params[:tag_list],@user)
-    @todo.reload
+    if @saved
+      @todo.tag_with(params[:tag_list],@user)
+      @todo.reload
+    end
     
     respond_to do |wants|
       wants.html { redirect_to :action => "index" }
diff --git a/tracks/app/controllers/users_controller.rb b/tracks/app/controllers/users_controller.rb
index da371e1d..3821815b 100644
--- a/tracks/app/controllers/users_controller.rb
+++ b/tracks/app/controllers/users_controller.rb
@@ -80,11 +80,13 @@ class UsersController < ApplicationController
           return
         end
 
-        user.is_admin = true if User.no_users_yet?
+        first_user_signing_up = User.no_users_yet?
+        user.is_admin = true if first_user_signing_up
         if user.save
           @user = User.authenticate(user.login, params['user']['password'])
           @user.create_preference
           @user.save
+          session['user_id'] = @user.id if first_user_signing_up
           notify :notice, "Signup successful for user #{@user.login}."
           redirect_back_or_home
         end
diff --git a/tracks/app/views/projects/index.rhtml b/tracks/app/views/projects/index.rhtml
index 3ccebf1c..350b68f6 100644
--- a/tracks/app/views/projects/index.rhtml
+++ b/tracks/app/views/projects/index.rhtml
@@ -9,6 +9,7 @@
   <%= render :partial => 'project_state_group', :object => @completed_projects, :locals => { :state => 'completed'} %>
 </div>
 
+<% @project = @new_project -%>
 <div id="input_box">
   <%= link_to_function("Create a new project &#187;",
                        "Element.toggle('project_new');Form.focusFirstElement('project-form');",
diff --git a/tracks/test/selenium/login/first_run_shows_signup.rsel b/tracks/test/selenium/login/first_run_shows_signup.rsel
index 8f3f00ce..64d328c0 100644
--- a/tracks/test/selenium/login/first_run_shows_signup.rsel
+++ b/tracks/test/selenium/login/first_run_shows_signup.rsel
@@ -5,6 +5,4 @@ type "user_login", "admin"
 type "user_password", "abracadabra"
 type "user_password_confirmation", "abracadabra"
 click_and_wait "signup"
-assert_title 'exact:TRACKS::Login'
-include_partial 'login/login', :username => 'admin', :password => 'abracadabra'
 assert_title 'exact:TRACKS::List tasks'
diff --git a/tracks/test/selenium/project_listing/edit_then_delete.rsel b/tracks/test/selenium/project_listing/edit_then_delete.rsel
index a2549d16..696c7118 100644
--- a/tracks/test/selenium/project_listing/edit_then_delete.rsel
+++ b/tracks/test/selenium/project_listing/edit_then_delete.rsel
@@ -8,6 +8,8 @@ type "//div[@id='edit_project_2'] //input[@name='project[name]']", "become a bil
 click "//div[@id='edit_project_2'] //input[@value='Update']"
 wait_for_not_visible "edit_project_2"
 wait_for_visible "project_2"
+wait_for_visible "flash"
+wait_for_not_visible "flash"
 click "css=#project_2 .buttons img.delete_item"
 assert_confirmation "Are you sure that you want to delete the project 'become a billionaire'?"
 wait_for_visible "flash"