diff --git a/puppet/modules/site_couchdb/files/designs/identities/Identity.json b/puppet/modules/site_couchdb/files/designs/identities/Identity.json
index c099ae4a9eb582000bcefa6a5794b1b7c9263278..e35d756bd0e5e97cb97f39a5e489d956181dc01b 100644
--- a/puppet/modules/site_couchdb/files/designs/identities/Identity.json
+++ b/puppet/modules/site_couchdb/files/designs/identities/Identity.json
@@ -18,6 +18,9 @@
     "cert_fingerprints_by_expiry": {
       "map": "function(doc) {\n  if (doc.type != 'Identity') {\n    return;\n  }\n  if (typeof doc.cert_fingerprints === \"object\") {\n    for (fp in doc.cert_fingerprints) {\n      if (doc.cert_fingerprints.hasOwnProperty(fp)) {\n        emit(doc.cert_fingerprints[fp], fp);\n      }\n    }\n  }\n}\n"
     },
+    "keys_by_email": {
+      "map": "function(doc) {\n  if (doc.type != 'Identity') {\n    return;\n  }\n  if (typeof doc.keys === \"object\") {\n    emit(doc.address, doc.keys);\n  }\n}\n"
+    },
     "pgp_key_by_email": {
       "map": "function(doc) {\n  if (doc.type != 'Identity') {\n    return;\n  }\n  if (typeof doc.keys === \"object\") {\n    emit(doc.address, doc.keys[\"pgp\"]);\n  }\n}\n"
     },
@@ -30,5 +33,5 @@
       "reduce": "_sum"
     }
   },
-  "couchrest-hash": "4a774c3f56122b655a314670403b27e2"
+  "couchrest-hash": "fbc2bd6950424cf7f3fa44ff899615a1"
 }
\ No newline at end of file