diff --git a/app/models/user.rb b/app/models/user.rb
index a8f7c3c52bd7f2ac7107da072c440295218072f7..1c0bf1b97cd6be52f3c5297a9d8103096cf96ad1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -16,7 +16,7 @@ class User
 
   many :groups, :class_name => 'Group'
 
-  before_validation_on_create :assign_key
+  before_validation_on_create :setup_person
   before_validation :do_bad_things 
   
   ######## Making things work ########
@@ -330,7 +330,7 @@ class User
   end
 
   def setup_person
-    self.person.serialized_key ||= generate_key.export
+    assign_key
     self.person.email = email
     self.person.save!
   end