diff --git a/app/models/person.rb b/app/models/person.rb
index eb87b84..680d7c1 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -104,7 +104,7 @@ class Person < Profile
   hacked_after_create :insert_default_homepage_and_feed
 
   def name
-    person_info.name || self[:name]
+    person_info.nil? ? self[:name] : (person_info.name || self[:name])
   end
 
 end
diff --git a/test/unit/person_test.rb b/test/unit/person_test.rb
index fea8d9a..eff71ea 100644
--- a/test/unit/person_test.rb
+++ b/test/unit/person_test.rb
@@ -209,4 +209,10 @@ class PersonTest < Test::Unit::TestCase
     assert_equal 'José', p.name
   end
 
+  should 'fallback to login when person_info is not present' do
+    p = create_user('randomhacker').person
+    p.person_info = nil
+    assert_equal 'randomhacker', p.name
+  end
+
 end
--
libgit2 0.21.2