diff --git a/conf/manager.sql b/conf/manager.sql
index 4f67405c2a294b149ac1ba49c207fd6fd9aba631..9c1c3accf62bf3c62e10de958521681ca029f3fa 100644
--- a/conf/manager.sql
+++ b/conf/manager.sql
@@ -7,6 +7,7 @@ CREATE TABLE tokens (
     expiration_date datetime DEFAULT NULL,
     PRIMARY KEY (id),
     KEY token (token),
+    KEY email_entity (email_address,entityid)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 CREATE TABLE entities (