diff -r bae89dd72ba8 server/src/org/netbeans/modules/server/ui/node/RootNode.java
--- a/server/src/org/netbeans/modules/server/ui/node/RootNode.java	Fri Apr 03 08:04:47 2009 +0200
+++ b/server/src/org/netbeans/modules/server/ui/node/RootNode.java	Fri Apr 03 15:48:02 2009 +0200
@@ -41,8 +41,11 @@
 
 package org.netbeans.modules.server.ui.node;
 
+import java.awt.EventQueue;
+import java.awt.event.ActionEvent;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -53,6 +56,8 @@
 import org.netbeans.api.server.ServerInstance;
 import org.netbeans.modules.server.ServerRegistry;
 import org.netbeans.spi.server.ServerInstanceProvider;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
 import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
@@ -115,7 +120,24 @@
             RequestProcessor.getDefault().post(new Runnable() {
 
                 public void run() {
+                    if (EventQueue.isDispatchThread()) {
+                        for (Action a : Utilities.actionsForPath("Servers/Actions")) {
+                            if (a != null) {
+                                if (a.getValue(Action.NAME).toString().contains("EE")) {
+                                    a.actionPerformed(new ActionEvent(this, 0, "onlyEnable"));
+                                }
+                            }
+                        }
+                        return;
+                    }
+
                     synchronized (ChildFactory.this) {
+                        for (Object object : System.getProperties().keySet()) {
+                            if ("org.netbeans.modules.tomcat.autoregister.catalinaHome".equals(object)) {
+                                EventQueue.invokeLater(this);
+                            }
+                        }
+
                         final ServerRegistry registry = ServerRegistry.getInstance();
 
                         registry.addChangeListener(