diff --git a/src/libtomahawk/playlist/PlaylistModel.cpp b/src/libtomahawk/playlist/PlaylistModel.cpp
index 98a29e707..4b5c4e2c6 100644
--- a/src/libtomahawk/playlist/PlaylistModel.cpp
+++ b/src/libtomahawk/playlist/PlaylistModel.cpp
@@ -135,7 +135,9 @@ PlaylistModel::onPlaylistChanged()
     Q_D( PlaylistModel );
     QString age = TomahawkUtils::ageToString( QDateTime::fromTime_t( d->playlist->createdOn() ), true );
     QString desc;
-    if ( d->playlist->creator().isEmpty() )
+
+    // we check for "someone" to work-around an old bug
+    if ( d->playlist->creator().isEmpty() || d->playlist->creator() == "someone" )
     {
         if ( d->playlist->author()->isLocal() )
         {
diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp
index 804050b1f..f71982664 100644
--- a/src/tomahawk/TomahawkWindow.cpp
+++ b/src/tomahawk/TomahawkWindow.cpp
@@ -1243,8 +1243,8 @@ TomahawkWindow::createPlaylist()
         }
     }
 
-    QString info  = ""; // FIXME
-    QString creator = "someone"; // FIXME
+    QString info  = ""; // FIXME?
+    QString creator = ""; // FIXME?
 
     playlist_ptr playlist = Tomahawk::Playlist::create( SourceList::instance()->getLocal(), uuid(), playlistName, info, creator, false, QList< query_ptr>() );
     ViewManager::instance()->show( playlist );