diff --git a/ddportfolioservice/model/keyfinder.py b/ddportfolioservice/model/keyfinder.py
index 531cab9..f70566c 100644
--- a/ddportfolioservice/model/keyfinder.py
+++ b/ddportfolioservice/model/keyfinder.py
@@ -28,7 +28,8 @@ given keyring.
 db = None
 
 def _get_keyring_cache():
-    if db = None:
+    global db
+    if not db:
         import anydbm
         import pkg_resources
         import os.path
diff --git a/ddportfolioservice/model/keyringanalyzer.py b/ddportfolioservice/model/keyringanalyzer.py
index a8b7090..7ef1cbe 100644
--- a/ddportfolioservice/model/keyringanalyzer.py
+++ b/ddportfolioservice/model/keyringanalyzer.py
@@ -112,6 +112,8 @@ def process_keyrings():
                     login = email[0:-len('@debian.org')]
                     _add_to_result('login:email:%s' % email, login)
                     _add_to_result('login:fpr:%s' % fpr, login)
+                    _add_to_result('fpr:login:%s' % login, fpr)
+                _add_to_result('fpr:email:%s' % email, fpr)
                 _add_to_result('email:fpr:%s' % fpr, email)
             if uid:
                 _add_to_result('name:fpr:%s' % fpr, uid)