diff --git a/app/models/invitation.rb b/app/models/invitation.rb
index 2e5c787d802bbeab67e78d747c2b60bbb2993992..2ce287e6ba256a50dbbfbc1e003cd7bdf3d5421c 100644
--- a/app/models/invitation.rb
+++ b/app/models/invitation.rb
@@ -57,7 +57,7 @@ class Invitation < ActiveRecord::Base
     invitee.invites = opts[:invites] || 5
     if invitee.new_record?
       invitee.errors.clear
-      invitee.serialized_private_key ||= User.generate_key
+      invitee.serialized_private_key = User.generate_key if invitee.serialized_private_key.blank?
       invitee.send(:generate_invitation_token)
     elsif invitee.invitation_token.nil?
       return invitee
diff --git a/app/models/user.rb b/app/models/user.rb
index 0f850180b4e0b7745fdc6b8269b01fce85be648b..22caf2766373cbfb1f477adddfb9070999be6631 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -260,7 +260,7 @@ class User < ActiveRecord::Base
     self.person.url = AppConfig[:pod_url]
 
 
-    self.serialized_private_key ||= User.generate_key
+    self.serialized_private_key = User.generate_key if self.serialized_private_key.blank?
     self.person.serialized_public_key = OpenSSL::PKey::RSA.new(self.serialized_private_key).public_key
 
     self