diff --git a/admin/demo.h2.db b/admin/demo-scott.h2.db
similarity index 100%
rename from admin/demo.h2.db
rename to admin/demo-scott.h2.db
diff --git a/demo-sakila.h2.db b/demo-sakila.h2.db
new file mode 100644
index 000000000..1bc568c2d
Binary files /dev/null and b/demo-sakila.h2.db differ
diff --git a/demo.h2.db b/demo-scott.h2.db
similarity index 100%
rename from demo.h2.db
rename to demo-scott.h2.db
diff --git a/src/main/net/sf/jailer/ui/DataModelManagerDialog.java b/src/main/net/sf/jailer/ui/DataModelManagerDialog.java
index eed029bdd..a97d843d1 100755
--- a/src/main/net/sf/jailer/ui/DataModelManagerDialog.java
+++ b/src/main/net/sf/jailer/ui/DataModelManagerDialog.java
@@ -539,6 +539,7 @@ public abstract class DataModelManagerDialog extends javax.swing.JFrame {
     private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed
         hasSelectedModel = false;
         setVisible(false);
+        dispose();
     }//GEN-LAST:event_jButton2ActionPerformed
 
     private void analyzeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_analyzeButtonActionPerformed
diff --git a/src/main/net/sf/jailer/ui/DbConnectionDialog.java b/src/main/net/sf/jailer/ui/DbConnectionDialog.java
index d4a508b5d..c8a5311d9 100755
--- a/src/main/net/sf/jailer/ui/DbConnectionDialog.java
+++ b/src/main/net/sf/jailer/ui/DbConnectionDialog.java
@@ -342,6 +342,7 @@ public class DbConnectionDialog extends javax.swing.JDialog {
 		connectionList = new ArrayList<ConnectionInfo>();
 		currentConnection = null;
 		boolean ok = false;
+		boolean preV4 = true;
 		
 		try {
             File file = new File(CONNECTIONS_FILE);
@@ -354,8 +355,9 @@ public class DbConnectionDialog extends javax.swing.JDialog {
                 	for (int n = 0; n < dma.size(); ++n) {
                 		cis.get(n).dataModelFolder = dma.get(n);
                 	}
+                	preV4 = false;
                 } catch (Throwable t) {
-                	// ignore. pre 3.8 files do not contain data model assignments.
+                	// ignore. pre 4.0 files do not contain data model assignments.
                 }
                 in.close();
                 connectionList = cis;
@@ -398,13 +400,25 @@ public class DbConnectionDialog extends javax.swing.JDialog {
 		}
 		if (connectionList.size() == 0) {
 			ConnectionInfo ci = new ConnectionInfo();
-			ci.alias = applicationName + "DemoDatabase";
+			ci.alias = "Demo Scott";
 			ci.driverClass = "org.h2.Driver";
 			ci.jar1 = "lib" + File.separator + "h2-1.3.160.jar";
-			ci.url = "jdbc:h2:demo";
+			ci.url = "jdbc:h2:demo-scott";
 			ci.user = "sa";
 			ci.password = "";
-			ci.dataModelFolder = "Demo";
+			ci.dataModelFolder = "Demo-Scott";
+			connectionList.add(ci);
+			store();
+		}
+		if (preV4) {
+			ConnectionInfo ci = new ConnectionInfo();
+			ci.alias = "Demo Sakila";
+			ci.driverClass = "org.h2.Driver";
+			ci.jar1 = "lib" + File.separator + "h2-1.3.160.jar";
+			ci.url = "jdbc:h2:demo-sakila";
+			ci.user = "sa";
+			ci.password = "";
+			ci.dataModelFolder = "Demo-Sakila";
 			connectionList.add(ci);
 			store();
 		}