diff --git a/conf/manager.sql b/conf/manager.sql
index 3edf34659c72e49b5541de0cc8a63694d6e9ef83..8f97393c98ab2b11699e78a5df27a036f5435cdf 100644
--- a/conf/manager.sql
+++ b/conf/manager.sql
@@ -6,8 +6,8 @@ CREATE TABLE tokens (
     creation_date datetime DEFAULT NULL,
     expiration_date datetime DEFAULT NULL,
     PRIMARY KEY (id),
-    KEY secret (secret),
-    KEY email_entity (email_address,entityid)
+    UNIQUE (secret),
+    UNIQUE (email_address(50),entityid(50))
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 CREATE TABLE entities (
@@ -20,7 +20,7 @@ CREATE TABLE entities (
     contacts varchar(2000) DEFAULT NULL,
     federations varchar(50) DEFAULT NULL,
     PRIMARY KEY (id),
-    KEY entityid (entityid)
+    UNIQUE (entityid)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 CREATE TABLE accounts (