diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index bb916a786..6fef6eb5d 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -13,6 +13,8 @@ function newEvent(sender) {
     day = currentDay;
 
   var hour = sender.getAttribute("hour");
+  if (!hour)
+    hour = '0800';
   var urlstr = (ApplicationBaseURL + "new"
                 + "?day=" + day
                 + "&hm=" + hour);
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 304409288..03b9d14f1 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -126,22 +126,22 @@ function extractEmailAddress(mailTo) {
 }
 
 function extractEmailName(mailTo) {
-  var name = "";
+  var emailName = "";
 
-  var namere = /(\w[\w\ _-]+)\ (&lt;|<)/;
-  if (namere.test(mailTo)) {
-    namere.exec(mailTo);
-    name = RegExp.$1;
+  var emailNamere = /(\w[\w\ _-]+)\ (&lt;|<)/;
+  if (emailNamere.test(mailTo)) {
+    emailNamere.exec(mailTo);
+    emailName = RegExp.$1;
   }
 }
 
 function sanitizeMailTo(dirtyMailTo) {
-  var name = extractEmailName(dirtyMailTo);
+  var emailName = extractEmailName(dirtyMailTo);
   var email = extractEmailAddress(dirtyMailTo);
 
   var mailto = "";
-  if (name.length > 0)
-    mailto = name + ' <' + email + '>';
+  if (emailName.length > 0)
+    mailto = emailName + ' <' + email + '>';
   else
     mailto = email;
 
@@ -294,6 +294,7 @@ function getQueryParaArray(s) {
   if (s.charAt(0) == "?") s = s.substr(1, s.length - 1);
   return s.split("&");
 }
+
 function getQueryParaValue(s, name) {
   var t;