diff --git a/app/models/user.rb b/app/models/user.rb
index c348057..d9bf605 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -195,7 +195,7 @@ class User < ActiveRecord::Base
   end
 
   def name
-    person.name
+    person ? person.name : login
   end
 
   def enable_email!
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index d09c01c..95b5112 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -397,6 +397,18 @@ class UserTest < Test::Unit::TestCase
     assert_equal 15, User.expires_chat_status_every
   end
 
+  should 'respond name with related person name' do
+    user = create_user('testuser')
+    user.person.name = 'Test User'
+    assert_equal 'Test User', user.name
+  end
+
+  should 'respond name with login, if there is no person related' do
+    user = create_user('testuser')
+    user.person = nil
+    assert_equal 'testuser', user.name
+  end
+
   protected
     def new_user(options = {})
       user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
--
libgit2 0.21.2