diff --git a/src/database/User.cpp b/src/database/User.cpp
index 751e614e..4024e2d4 100644
--- a/src/database/User.cpp
+++ b/src/database/User.cpp
@@ -83,6 +83,12 @@ User::getAll(Wt::Dbo::Session& session)
 	return std::vector<pointer>(res.begin(), res.end());
 }
 
+User::pointer
+User::create(Wt::Dbo::Session& session)
+{
+	return session.add(new User());
+}
+
 User::pointer
 User::getById(Wt::Dbo::Session& session, id_type id)
 {
diff --git a/src/database/User.hpp b/src/database/User.hpp
index de065e68..e772f404 100644
--- a/src/database/User.hpp
+++ b/src/database/User.hpp
@@ -64,6 +64,9 @@ class User
 
 		typedef Wt::Dbo::ptr<User>	pointer;
 
+		// utility
+		static pointer create(Wt::Dbo::Session& session);
+
 		// accessors
 		static pointer			getById(Wt::Dbo::Session& session, id_type id);
 		static std::vector<pointer>	getAll(Wt::Dbo::Session& session);
diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp
index 3e935f67..db4ee7b4 100644
--- a/src/ui/LmsApplication.cpp
+++ b/src/ui/LmsApplication.cpp
@@ -101,6 +101,10 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti
 		Wt::Dbo::Transaction transaction(DboSession());
 
 		firstConnection = (Database::User::getAll(DboSession()).size() == 0);
+
+		// Create a fake user
+		// TODO settings
+		Database::User::create(DboSession());
 	}
 
 	LMS_LOG(UI, DEBUG) << "Creating root widget. First connection = " << std::boolalpha << firstConnection;
diff --git a/src/ui/PlaylistView.cpp b/src/ui/PlaylistView.cpp
index c50d3925..5cc4350c 100644
--- a/src/ui/PlaylistView.cpp
+++ b/src/ui/PlaylistView.cpp
@@ -120,7 +120,7 @@ Playlist::addSome()
 		return;
 
 	bool moreResults;
-	auto tracks = playlist->getTracks(_entriesContainer->count(), 20, moreResults);
+	auto tracks = playlist->getTracks(_entriesContainer->count(), 50, moreResults);
 	for (auto track : tracks)
 	{
 		Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-playlist-entry"), _entriesContainer);