diff --git a/src/main/java/com/commafeed/CommaFeedApplication.java b/src/main/java/com/commafeed/CommaFeedApplication.java
index 33680dee..d5c9410d 100644
--- a/src/main/java/com/commafeed/CommaFeedApplication.java
+++ b/src/main/java/com/commafeed/CommaFeedApplication.java
@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.eclipse.jetty.server.session.SessionHandler;
 import org.glassfish.jersey.media.multipart.MultiPartFeature;
+import org.hibernate.cfg.AvailableSettings;
 
 import com.commafeed.backend.feed.FeedRefreshTaskGiver;
 import com.commafeed.backend.feed.FeedRefreshUpdater;
@@ -89,14 +90,18 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 				FeedSubscription.class, User.class, UserRole.class, UserSettings.class) {
 			@Override
 			public DataSourceFactory getDataSourceFactory(CommaFeedConfiguration configuration) {
-				return configuration.getDatabase();
+				DataSourceFactory factory = configuration.getDataSourceFactory();
+
+				// keep using old id generator for backward compatibility
+				factory.getProperties().put(AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS, "false");
+				return factory;
 			}
 		});
 
 		bootstrap.addBundle(new MigrationsBundle<CommaFeedConfiguration>() {
 			@Override
 			public DataSourceFactory getDataSourceFactory(CommaFeedConfiguration configuration) {
-				return configuration.getDatabase();
+				return configuration.getDataSourceFactory();
 			}
 		});
 
diff --git a/src/main/java/com/commafeed/CommaFeedConfiguration.java b/src/main/java/com/commafeed/CommaFeedConfiguration.java
index 8b41b4de..640a1a0d 100644
--- a/src/main/java/com/commafeed/CommaFeedConfiguration.java
+++ b/src/main/java/com/commafeed/CommaFeedConfiguration.java
@@ -35,7 +35,7 @@ public class CommaFeedConfiguration extends Configuration {
 	@Valid
 	@NotNull
 	@JsonProperty("database")
-	private DataSourceFactory database = new DataSourceFactory();
+	private DataSourceFactory dataSourceFactory = new DataSourceFactory();
 
 	@Valid
 	@NotNull