diff --git a/app/models/user.rb b/app/models/user.rb
index a7bdcd294..aa1cbb296 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -77,7 +77,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
@@ -94,7 +94,6 @@ Name-Real: #{self.real_name}
 Name-Comment: #{self.url}
 Name-Email: #{self.email}
 Expire-Date: 0
-Passphrase: #{self.password}
 </GnupgKeyParms>"
     ctx.genkey(paramstring, nil, nil)
     
diff --git a/gpg/diaspora-test/pubring.gpg b/gpg/diaspora-test/pubring.gpg
index da64a4ec3..721861b75 100644
Binary files a/gpg/diaspora-test/pubring.gpg and b/gpg/diaspora-test/pubring.gpg differ
diff --git a/gpg/diaspora-test/random_seed b/gpg/diaspora-test/random_seed
index 6239b704b..43eed0109 100644
Binary files a/gpg/diaspora-test/random_seed and b/gpg/diaspora-test/random_seed differ
diff --git a/gpg/diaspora-test/secring.gpg b/gpg/diaspora-test/secring.gpg
index 53286a621..eccac9905 100644
Binary files a/gpg/diaspora-test/secring.gpg and b/gpg/diaspora-test/secring.gpg differ
diff --git a/gpg/diaspora-test/trustdb.gpg b/gpg/diaspora-test/trustdb.gpg
index f52c08a1d..400230545 100644
Binary files a/gpg/diaspora-test/trustdb.gpg and b/gpg/diaspora-test/trustdb.gpg differ
diff --git a/spec/user_encryption_spec.rb b/spec/user_encryption_spec.rb
index ad841d22b..b07fb39d1 100644
--- a/spec/user_encryption_spec.rb
+++ b/spec/user_encryption_spec.rb
@@ -26,6 +26,11 @@ describe 'user encryption' do
   it 'should retrieve a user key' do
     @u.key.subkeys[0].fpr.should  == @u.key_fingerprint
   end
+
+  describe 'key exchange on friending' do
+    
+  end
+
   describe 'signing and verifying' do
     
     it 'should sign a message on create' do
@@ -41,7 +46,6 @@ describe 'user encryption' do
     
     it 'should know if the signature is from the wrong person' do
       pending
-      my_message = Factory.create(
     end
     
   end