diff --git a/contrib/openldap/core-fd-conf.schema b/contrib/openldap/core-fd-conf.schema
index 82538bb2cca46051b11fe8cf1fa7e875add58dd0..dff0cbff28285a189d78d30efd98f092e7cfde3b 100644
--- a/contrib/openldap/core-fd-conf.schema
+++ b/contrib/openldap/core-fd-conf.schema
@@ -496,15 +496,6 @@ attributetype ( 1.3.6.1.4.1.38414.8.21.5 NAME 'fdCasContext'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE)
 
-#tokens RDN
-
-attributetype ( 1.3.6.1.4.1.38414.8.22.2 NAME 'fdRecoveryTokenRDN'
-  DESC 'FusionDirectory - Recovery Password Token RDN'
-  EQUALITY caseExactIA5Match
-  SUBSTR caseExactIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
 # merged from dashboard-fd.schema - Needed by Fusion Directory for dashboard options
 
 attributetype ( 1.3.6.1.4.1.38414.27.1.1 NAME 'fdDashboardPrefix'
@@ -582,6 +573,7 @@ attributetype ( 1.3.6.1.4.1.38414.8.110.9 NAME 'fdPasswordRecoveryUseAlternate'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE )
 
+
 # Object Class
 objectclass ( 1.3.6.1.4.1.38414.8.2.1 NAME 'fusionDirectoryConf'
   DESC 'FusionDirectory configuration'
diff --git a/html/include/pulldown.js b/html/include/pulldown.js
index c00fb00c5c93cfdce1d9bfbbd0f65948f2195e98..a906d9fd1c991fb7e6bd09a081f7395f8e9e738f 100644
--- a/html/include/pulldown.js
+++ b/html/include/pulldown.js
@@ -96,7 +96,7 @@ MenuContainer.prototype = {
 
     for (var i = 0; i < childNodes.length; i++) {
       var node = childNodes[i];
-      if (node.nodeType === 1) {
+      if (node.nodeType == 1) {
         if (this.type === "menuContainer") {
           if (node.tagName.toLowerCase() === "li") {
             this.menuItems.push(new MenuItem(node, this));
@@ -138,7 +138,7 @@ MenuContainer.prototype = {
         top: (Position.positionedOffset(this.parent.element)[1] + Element.getHeight(this.parent.element)) + "px"
       });
     } else if (this.menuType === "flyout") {
-      var parentMenuBorders = this.parentMenu ? this.parentMenu.getBorders() : {};
+      var parentMenuBorders = this.parentMenu ? this.parentMenu.getBorders() : new Object();
       var thisBorders = this.getBorders();
       if (
         (Position.positionedOffset(this.parentMenu.element)[0] + this.parentMenu.element.offsetWidth + this.element.offsetWidth + 20) >