diff --git a/UI/WebServerResources/UIxFreeBusyUserSelector.js b/UI/WebServerResources/UIxFreeBusyUserSelector.js
index d20447fd8..d47b5566c 100644
--- a/UI/WebServerResources/UIxFreeBusyUserSelector.js
+++ b/UI/WebServerResources/UIxFreeBusyUserSelector.js
@@ -7,18 +7,21 @@ var requestField;
 var awaitingFreeBusyRequests = new Array();
 var freeBusySelectorId;
 
-function onContactKeyUp(node, event)
-{
+function onContactKeyUp(node, event) {
   if (!running) {
     if (event.keyCode == 8
         || event.keyCode == 32
         || event.keyCode > 47) {
+      log ("keycode: " + event.keyCode);
       running = true;
       requestField = node;
       setTimeout("triggerRequest()", delay);
-    } else if (node.confirmedValue && event.keyCode == 13) {
-      node.value = node.confirmedValue;
-      node.setSelectionRange(node.value.length, node.value.length);
+    } else if (node.confirmedValue) {
+      log ("keycode: " + event.keyCode);
+      if (event.keyCode == 13) {
+        node.value = node.confirmedValue;
+        node.setSelectionRange(node.value.length, node.value.length);
+      }
     }
   }
 }
diff --git a/UI/WebServerResources/dtree.js b/UI/WebServerResources/dtree.js
index a642eedc6..891465d9a 100644
--- a/UI/WebServerResources/dtree.js
+++ b/UI/WebServerResources/dtree.js
@@ -12,6 +12,7 @@
 // Node object
 function Node(id, pid, name, url, onclick, dataname, datatype, title, target,
               icon, iconOpen, open) {
+  this.isParent = false;
   this.id = id;
   this.pid = pid;
   this.name = name;
@@ -104,6 +105,7 @@ dTree.prototype.toString = function() {
 dTree.prototype.addNode = function(pNode) {
   var str = '';
   var n=0;
+  pNode.isParent = true;
   if (this.config.inOrder) n = pNode._ai;
   for (n; n<this.aNodes.length; n++) {
     if (this.aNodes[n].pid == pNode.id) {
@@ -157,7 +159,10 @@ dTree.prototype.node = function(node, nodeId) {
       }
       str += '<img id="i' + this.obj + nodeId + '" src="' + ((node._io) ? node.iconOpen : node.icon) + '" alt="" />';
     }
-    str += '<span class="nodeName">' + node.name + '</span>';
+    str += '<span class="nodeName';
+    if (!node.isParent)
+      str += ' leaf';
+    str += '">' + node.name + '</span>';
     if (node.url || ((!this.config.folderLinks || !node.url) && node._hc)) str += '</a>';
     str += '</div>';
   }