diff --git a/app/models/user.rb b/app/models/user.rb
index 6a1762d6c..450d9ab7f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -40,7 +40,7 @@ class User < ActiveRecord::Base
 
   before_destroy :disconnect_everyone, :remove_person
   before_save do
-    person.save if person
+    person.save if person && person.changed?
   end
 
   attr_accessible :getting_started, :password, :password_confirmation, :language, :disable_mail