diff --git a/app/models/user.rb b/app/models/user.rb
index 37f8122d0..43f48b70d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,7 +4,7 @@ class User < Person
          :recoverable, :rememberable, :trackable, :validatable
          
   
-  #before_create :assign_key
+  before_create :assign_key
   validates_presence_of :profile
   
   before_validation :do_bad_things
@@ -68,7 +68,7 @@ class User < Person
   def assign_key
     keys = GPGME.list_keys(nil, true)
     if keys.empty?
-      generate_key
+      #generate_key
     end
     self.key_fingerprint = GPGME.list_keys(nil, true).first.subkeys.first.fingerprint
   end