2 files changed, 9 insertions, 6 deletions

diff --git a/src/app.c b/src/app.c
index e7f31dbe..43e69446 100644
--- a/src/app.c
+++ b/src/app.c
@@ -569,6 +569,7 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
     if (equal_Command(cmd, "ident.accept") || equal_Command(cmd, "cancel")) {        
         if (equal_Command(cmd, "ident.accept")) {
             const iString *commonName   = text_InputWidget (findChild_Widget(dlg, "ident.common"));
+            const iString *email        = text_InputWidget (findChild_Widget(dlg, "ident.email"));
             const iString *userId       = text_InputWidget (findChild_Widget(dlg, "ident.userid"));
             const iString *domain       = text_InputWidget (findChild_Widget(dlg, "ident.domain"));
             const iString *organization = text_InputWidget (findChild_Widget(dlg, "ident.org"));
@@ -616,7 +617,7 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
             }
             /* The input seems fine. */
             newIdentity_GmCerts(d->certs, isTemp ? temporary_GmIdentityFlag : 0,
-                                until, commonName, userId, domain, organization, country);
+                                until, commonName, email, userId, domain, organization, country);
             postCommandf_App("sidebar.mode arg:%d show:1", identities_SidebarMode);
             postCommand_App("idents.changed");
         }
diff --git a/src/ui/util.c b/src/ui/util.c
index a24b3199..71146682 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -860,17 +860,19 @@ iWidget *makeIdentityCreation_Widget(void) {
         page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
     iWidget *values = addChildFlags_Widget(
         page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
-    iInputWidget *inputs[5];
+    iInputWidget *inputs[6];
     addChild_Widget(headings, iClob(makeHeading_Widget("Common name:")));
     setId_Widget(addChild_Widget(values, iClob(inputs[0] = new_InputWidget(0))), "ident.common");
+    addChild_Widget(headings, iClob(makeHeading_Widget("Email:")));
+    setId_Widget(addChild_Widget(values, iClob(inputs[1] = newHint_InputWidget(0, "optional"))), "ident.email");
     addChild_Widget(headings, iClob(makeHeading_Widget("User ID:")));
-    setId_Widget(addChild_Widget(values, iClob(inputs[1] = newHint_InputWidget(0, "optional"))), "ident.userid");
+    setId_Widget(addChild_Widget(values, iClob(inputs[2] = newHint_InputWidget(0, "optional"))), "ident.userid");
     addChild_Widget(headings, iClob(makeHeading_Widget("Domain:")));
-    setId_Widget(addChild_Widget(values, iClob(inputs[2] = newHint_InputWidget(0, "optional"))), "ident.domain");
+    setId_Widget(addChild_Widget(values, iClob(inputs[3] = newHint_InputWidget(0, "optional"))), "ident.domain");
     addChild_Widget(headings, iClob(makeHeading_Widget("Organization:")));
-    setId_Widget(addChild_Widget(values, iClob(inputs[3] = newHint_InputWidget(0, "optional"))), "ident.org");
+    setId_Widget(addChild_Widget(values, iClob(inputs[4] = newHint_InputWidget(0, "optional"))), "ident.org");
     addChild_Widget(headings, iClob(makeHeading_Widget("Country:")));
-    setId_Widget(addChild_Widget(values, iClob(inputs[4] = newHint_InputWidget(0, "optional"))), "ident.country");
+    setId_Widget(addChild_Widget(values, iClob(inputs[5] = newHint_InputWidget(0, "optional"))), "ident.country");
     addChild_Widget(headings, iClob(makeHeading_Widget("Valid until:")));
     setId_Widget(addChild_Widget(values, iClob(newHint_InputWidget(19, "YYYY-MM-DD HH:MM:SS"))), "ident.until");
     addChild_Widget(headings, iClob(makeHeading_Widget("Temporary:")));