diff --git a/app/models/person.rb b/app/models/person.rb
index 2756bac..41accc1 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -100,7 +100,7 @@ class Person < Profile
   hacked_after_create :insert_default_homepage_and_feed
 
   def name
-    if !self[:name].nil?
+    if !self[:name].blank?
       self[:name]
     else
       self.user ? self.user.login : nil
diff --git a/test/unit/person_test.rb b/test/unit/person_test.rb
index 189ee42..1905df3 100644
--- a/test/unit/person_test.rb
+++ b/test/unit/person_test.rb
@@ -219,6 +219,12 @@ class PersonTest < Test::Unit::TestCase
     assert_equal 'randomhacker', p.name
   end
 
+  should 'fallback to login when name is blank' do
+    p = create_user('randomhacker').person
+    p.name = ''
+    assert_equal 'randomhacker', p.name
+  end
+
   should 'have favorite enterprises' do
     p = create_user('test_person').person
     e = Enterprise.create!(:name => 'test_ent', :identifier => 'test_ent')
--
libgit2 0.21.2