diff --git a/src/app.c b/src/app.c
index 9a8e78ae..0cc93b12 100644
--- a/src/app.c
+++ b/src/app.c
@@ -823,6 +823,11 @@ iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf, iBool switchToNe
 
 static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
     iApp *d = &app_;
+    if (equal_Command(cmd, "ident.temp.changed")) {
+        setFlags_Widget(
+            findChild_Widget(dlg, "ident.temp.note"), hidden_WidgetFlag, !arg_Command(cmd));
+        return iFalse;
+    }
     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"));
diff --git a/src/ui/util.c b/src/ui/util.c
index e65e089d..ec0d904d 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1216,8 +1216,25 @@ iWidget *makeIdentityCreation_Widget(void) {
     iWidget *values = addChildFlags_Widget(
         page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
     iInputWidget *inputs[6];
+    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("Common name:")));
     setId_Widget(addChild_Widget(values, iClob(inputs[0] = new_InputWidget(0))), "ident.common");
+    /* Temporary? */ {
+        addChild_Widget(headings, iClob(makeHeading_Widget("Temporary:")));
+        iWidget *tmpGroup = new_Widget();
+        setFlags_Widget(tmpGroup, arrangeSize_WidgetFlag | arrangeHorizontal_WidgetFlag, iTrue);
+        addChild_Widget(tmpGroup, iClob(makeToggle_Widget("ident.temp")));
+        setId_Widget(
+            addChildFlags_Widget(
+                tmpGroup,
+                iClob(new_LabelWidget(uiTextCaution_ColorEscape "\u26a0  not saved to disk", NULL)),
+                hidden_WidgetFlag),
+            "ident.temp.note");
+        addChild_Widget(values, iClob(tmpGroup));
+    }
+    addChild_Widget(headings, iClob(makePadding_Widget(gap_UI)));
+    addChild_Widget(values, iClob(makePadding_Widget(gap_UI)));
     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:")));
@@ -1228,10 +1245,6 @@ iWidget *makeIdentityCreation_Widget(void) {
     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[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:")));
-    addChild_Widget(values, iClob(makeToggle_Widget("ident.temp")));
     arrange_Widget(dlg);
     for (size_t i = 0; i < iElemCount(inputs); ++i) {
         as_Widget(inputs[i])->rect.size.x = 100 * gap_UI - headings->rect.size.x;