diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
index ac764eb183..b1394160c2 100644
--- a/chrome/content/zotero/xpcom/schema.js
+++ b/chrome/content/zotero/xpcom/schema.js
@@ -3329,6 +3329,10 @@ Zotero.Schema = new function(){
 					Zotero.DB.query("CREATE TABLE syncedSettings (\n    setting TEXT NOT NULL,\n    libraryID INT NOT NULL,\n    value NOT NULL,\n    version INT NOT NULL DEFAULT 0,\n    synced INT NOT NULL DEFAULT 0,\n    PRIMARY KEY (setting, libraryID)\n)");
 					Zotero.DB.query("INSERT OR IGNORE INTO syncObjectTypes VALUES (7, 'setting')");
 				}
+				
+				if (i == 78) {
+					Zotero.DB.query("CREATE INDEX creatorData_name ON creatorData(lastName, firstName)");
+				}
 			}
 			
 			_updateDBVersion('userdata2', toVersion);
diff --git a/resource/schema/userdata.sql b/resource/schema/userdata.sql
index c932292b2b..fd833a7242 100644
--- a/resource/schema/userdata.sql
+++ b/resource/schema/userdata.sql
@@ -1,4 +1,4 @@
--- 77
+-- 78
 
 -- Copyright (c) 2009 Center for History and New Media
 --                    George Mason University, Fairfax, Virginia, USA
@@ -162,6 +162,7 @@ CREATE TABLE creatorData (
     fieldMode INT,
     birthYear INT
 );
+CREATE INDEX creatorData_name ON creatorData(lastName, firstName);
 
 CREATE TABLE itemCreators (
     itemID INT,