3 files changed, 10 insertions, 9 deletions

diff --git a/src/gmcerts.c b/src/gmcerts.c
index 09728414..96013392 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -277,6 +277,7 @@ static void loadIdentityFromCertificate_GmCerts_(iGmCerts *d, const iString *crt
         iDate today;
         initCurrent_Date(&today);
         set_String(&ident->notes, collect_String(format_Date(&today, "Imported on %b %d, %Y")));
+        pushBack_PtrArray(&d->idents, ident);
     }
     setCertificate_GmIdentity_(ident, cert);
     delete_Block(finger);
@@ -414,15 +415,16 @@ const iGmIdentity *identityForUrl_GmCerts(const iGmCerts *d, const iString *url)
 }
 
 iGmIdentity *newIdentity_GmCerts(iGmCerts *d, int flags, iDate validUntil, const iString *commonName,
-                                 const iString *userId, const iString *domain, const iString *org,
-                                 const iString *country) {
+                                 const iString *email, const iString *userId, const iString *domain,
+                                 const iString *org, const iString *country) {
     const iTlsCertificateName names[] = {
         { issuerCommonName_TlsCertificateNameType,    collectNewCStr_String("Lagrange v" LAGRANGE_APP_VERSION) },
         { issuerDomain_TlsCertificateNameType,        collectNewCStr_String("lagrange.skyjake.fi") },
         { subjectCommonName_TlsCertificateNameType,   commonName },
-        { subjectUserId_TlsCertificateNameType,       !isEmpty_String(userId) ? userId : NULL },
-        { subjectDomain_TlsCertificateNameType,       !isEmpty_String(domain) ? domain : NULL },
-        { subjectOrganization_TlsCertificateNameType, !isEmpty_String(org) ? org : NULL },
+        { subjectEmailAddress_TlsCertificateNameType, !isEmpty_String(email)   ? email   : NULL },
+        { subjectUserId_TlsCertificateNameType,       !isEmpty_String(userId)  ? userId  : NULL },
+        { subjectDomain_TlsCertificateNameType,       !isEmpty_String(domain)  ? domain  : NULL },
+        { subjectOrganization_TlsCertificateNameType, !isEmpty_String(org)     ? org     : NULL },
         { subjectCountry_TlsCertificateNameType,      !isEmpty_String(country) ? country : NULL },
         { 0, NULL }
     };
diff --git a/src/gmcerts.h b/src/gmcerts.h
index db1a6200..4be23169 100644
--- a/src/gmcerts.h
+++ b/src/gmcerts.h
@@ -69,9 +69,9 @@ iBool               checkTrust_GmCerts      (iGmCerts *, iRangecc domain, const
  * @returns Created identity. GmCerts retains ownership of returned object.
  */
 iGmIdentity *       newIdentity_GmCerts     (iGmCerts *, int flags, iDate validUntil,
-                                             const iString *commonName, const iString *userId,
-                                             const iString *domain, const iString *org,
-                                             const iString *country);
+                                             const iString *commonName, const iString *email,
+                                             const iString *userId, const iString *domain,
+                                             const iString *org, const iString *country);
 
 void                deleteIdentity_GmCerts  (iGmCerts *, iGmIdentity *identity);
 
diff --git a/src/gmrequest.c b/src/gmrequest.c
index b2022609..391c7e89 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -384,7 +384,6 @@ static const iBlock *replaceVariables_(const iBlock *block) {
             }
             remove_Block(replaced, span.start, size_Range(&span));
             insertData_Block(replaced, span.start, repl.start, size_Range(&repl));
-            printf("{%s}\n", cstr_Block(replaced));
             iZap(m);
         } while (matchRange_RegExp(var, range_Block(replaced), &m));
         block = replaced;