diff --git a/src/elogd.c b/src/elogd.c
index bd141192..38425870 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -9452,9 +9452,9 @@ int check_drafts(LOGBOOK * lbs)
       el_retrieve(lbs, draft_id[i], datetime, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL,
                   NULL, NULL, draft);
       
-      rsprintf("<tr><td class=\"dlgform\" align=\"center\">");
+      rsprintf("<tr><td class=\"draftsel\" align=\"center\">");
       rsprintf("Draft entry created on %s</td>\n", datetime);
-      rsprintf("<td class=\"dlgform\">");
+      rsprintf("<td class=\"draftsel\">");
       rsprintf("<input type=button value=\"%s\" onClick=\"window.location.href='%d?cmd=Edit';\">",
                loc("Edit"), draft_id[i]);
       rsprintf("</td></tr>\n");
@@ -27641,7 +27641,7 @@ void interprete(char *lbook, char *path)
       return;
    }
 
-   if (strieq(command, loc("Save")) && !isparam("cfgpage")) {
+   if (strieq(command, loc("Save")) && !isparam("cfgpage") && !isparam("new_user_name")) {
       /* save draft message */
       if (isparam("unm"))
          strlcpy(str, getparam("unm"), sizeof(str));
@@ -27779,7 +27779,7 @@ void interprete(char *lbook, char *path)
       return;
    }
 
-   if (strieq(command, loc("Save")) && isparam("cfgpage")) {
+   if (strieq(command, loc("Save")) && (isparam("cfgpage") || isparam("new_user_name"))) {
       if (isparam("config") && isparam("new_user_name")) {
          if (!strieq(getparam("config"), getparam("new_user_name"))) {
             if (get_user_line(lbs, getparam("new_user_name"), NULL, NULL, NULL, NULL, NULL, NULL) == 1) {
diff --git a/themes/default/default.css b/themes/default/default.css
index 3b0f9c3b..67f3f8d5 100755
--- a/themes/default/default.css
+++ b/themes/default/default.css
@@ -349,6 +349,11 @@ td {
   text-align:center;
 }
 
+.draftsel {
+   background-color:#DDEEBB;
+   padding:5px;
+   border-bottom:1px solid #486090;
+}
 /* attachment line */
 
 .attachment {