diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py
index b1182d4..76a7231 100644
--- a/komrade/backend/keymaker.py
+++ b/komrade/backend/keymaker.py
@@ -267,7 +267,7 @@ class Keymaker(Logger):
     def find_pubkey(self,name=None):
         self.log('<-',name)
         if not name: name=self.name
-        if 'pubkey' in self._keychain and self._keychain['pubkey']:
+        if self.name==name and 'pubkey' in self._keychain and self._keychain['pubkey']:
             pk=self._keychain['pubkey']
             return KomradeAsymmetricPublicKey(b64dec(pk)) if type(pk)==bytes else pk