diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
new file mode 100644
index 0000000000000000000000000000000000000000..df56462128ab2aec2088b354c91a6d1c6454be1e
--- /dev/null
+++ b/app/helpers/users_helper.rb
@@ -0,0 +1,10 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+module UsersHelper
+  def first_name_or_username (user)
+    set_name = user.person.profile.first_name
+    (set_name.nil? || set_name.empty?) ? user.username : user.person.profile.first_name 
+  end
+end
diff --git a/app/views/users/getting_started/_step_4.html.haml b/app/views/users/getting_started/_step_4.html.haml
index 24d37f5cc61c2710e033d485fc41352807e7c328..99c6c5512393b7d4a0d57592eb4e7a3bc4d1f90a 100644
--- a/app/views/users/getting_started/_step_4.html.haml
+++ b/app/views/users/getting_started/_step_4.html.haml
@@ -4,7 +4,7 @@
 
 
 %h1
-  = t('.set_up', :name => current_user.person.profile.first_name || current_user.username)
+  = t('.set_up', :name => first_name_or_username(current_user))
   .description
     = t('.ready_to_share')
     %ul.inline_aspect_listing
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 242579876a7001972bd00a554c4f0c55ff3ded2b..3668e7dcd953e06bf87ee985561f4d5515ebe66c 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -166,7 +166,7 @@ header
         :display block
       &:hover
         :background
-          :color #009
+          :color black
 
 
     &.active
diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..f88a235dab89f0bff297cc04bff1dc80f778a3da
--- /dev/null
+++ b/spec/helpers/users_helper_spec.rb
@@ -0,0 +1,19 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+require 'spec_helper'
+
+describe UsersHelper do
+  describe '#first_name_or_username' do
+    let(:user){ make_user }
+
+    it 'should display the first name if it is set' do
+      first_name_or_username(user).should == user.person.profile.first_name
+    end
+
+    it 'should display the username if the first name is empty' do
+      user.person.profile.first_name = ""
+      first_name_or_username(user).should == user.username
+    end
+  end
+end