diff --git a/resources/eloglang.spanish b/resources/eloglang.spanish
index 175bfbed..1452dab7 100755
--- a/resources/eloglang.spanish
+++ b/resources/eloglang.spanish
@@ -410,16 +410,11 @@ Anonymous = Anonimo
 Activation notice has been sent to %s = Notificacion de activacion enviada a %s
 Your request has been forwarded to the administrator = Su solicitud fue enviada al administrador
 You will be notified by email upon activation of your new account = Sera notificado por email cuando su cuenta sea activada
-
-
-#
-#---- please translate following items and then remove this comment ----#
-#
-Select period = 
-Last week = 
-Last month = 
-Last 3 Months = 
-Last 6 Months = 
-Last Year = 
-Enter %s = 
-Select %s = 
+Select period = Elija periodo
+Last week = Ultima semana
+Last month = Ultimo mes
+Last 3 Months = Ultimos 3 meses
+Last 6 Months = Ultimos 6 meses
+Last Year = Ultimo aņo
+Enter %s = Ingrese %s
+Select %s = Elija %s
diff --git a/scripts/elcode.js b/scripts/elcode.js
index d2c009fe..d5f3834c 100755
--- a/scripts/elcode.js
+++ b/scripts/elcode.js
@@ -110,6 +110,12 @@ function queryHeading(text)
    elcode1(text, tag, '', selection);
 }
 
+function insertTime(text)
+{
+   selection =	getSelection(text);
+   elcode1(text, '', datetime, selection);
+}
+
 function elKeyInit()
 {
    document.onkeypress = elKeyPress;
@@ -175,4 +181,4 @@ function elKeyPress(evt)
    }
    
    return true;
-}
\ No newline at end of file
+}
diff --git a/src/elogd.c b/src/elogd.c
index fc0a74f1..39a2eaf9 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -9233,6 +9233,13 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
    else
       rsprintf("browser = 'Other';\n");
 
+   if (!getcfg(lbs->name, "Time format", format, sizeof(format)))
+      strcpy(format, DEFAULT_TIME_FORMAT);
+   time(&ltime);
+   pts = localtime(&ltime);
+   my_strftime(str, sizeof(str), format, pts);
+   rsprintf("datetime = '%s';", str);
+
    rsprintf("//-->\n");
    rsprintf("</script>\n");
 
@@ -9999,6 +10006,9 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
       rsprintf("<option value=\"chocolate\" style=\"color:chocolate\">chocolate</option>\n");
       rsprintf("</select>");
 
+      rsprintf(" ");
+      ricon("clock", loc("Insert current time/date"), "insertTime(document.form1.Text)");
+
       rsprintf("</td></tr>\n");
    }