diff --git a/j2ee.sun.appsrv81/src/org/netbeans/modules/j2ee/sun/ide/j2ee/PluginProperties.java b/j2ee.sun.appsrv81/src/org/netbeans/modules/j2ee/sun/ide/j2ee/PluginProperties.java
--- a/j2ee.sun.appsrv81/src/org/netbeans/modules/j2ee/sun/ide/j2ee/PluginProperties.java
+++ b/j2ee.sun.appsrv81/src/org/netbeans/modules/j2ee/sun/ide/j2ee/PluginProperties.java
@@ -51,6 +51,7 @@
 import java.util.Properties;
 import java.util.logging.Level;
 
+import org.netbeans.modules.glassfish.eecommon.api.RegisterDatabase;
 import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
 import org.netbeans.modules.j2ee.sun.api.Asenv;
 import org.netbeans.modules.j2ee.sun.api.ServerLocationManager;
@@ -171,6 +172,8 @@
                 needToRegisterDefaultServer = true;
             }
             NbPreferences.forModule(PluginProperties.class).putBoolean(PROP_FIRST_RUN, true);
+            String prop = System.getProperty(ServerLocationManager.INSTALL_ROOT_PROP_NAME);
+            RegisterDatabase.getDefault().setupDerby(prop);
         } else {
             if (!NbPreferences.forModule(PluginProperties.class).getBoolean(REMOVED_DEFAULT_GFV2, false)) {
                 needToRegisterDefaultServer = true;