diff --git a/app/models/user.rb b/app/models/user.rb
index d5d954f..4b22263 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -280,12 +280,12 @@ class User < ActiveRecord::Base
   end
 
   def name
-    name = (self[:name] || login)
+    name = (@name || login)
     person.nil? ? name : (person.name || name)
   end
 
   def name= name
-    self[:name] = name
+    @name = name
   end
 
   def enable_email!
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 4551feb..8198c71 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -305,7 +305,7 @@ class UserTest < ActiveSupport::TestCase
 
   should 'not has email activation pending if not have environment' do
     user = create_user('cooler')
-    user.expects(:environment).returns(nil)
+    user.expects(:environment).returns(nil).at_least_once
     EmailActivation.create!(:requestor => user.person, :target => Environment.default)
     assert !user.email_activation_pending?
   end
@@ -470,9 +470,9 @@ class UserTest < ActiveSupport::TestCase
 
   should 'respond name with user name attribute' do
     user = create_user('testuser')
+    user.login = 'Login User'
     user.person = nil
     user.name = 'Another User'
-    user.login = 'Login User'
     assert_equal 'Another User', user.name
   end
 
--
libgit2 0.21.2