diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index a8ab87c6e..9443b03ae 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -101,7 +101,9 @@ CREATE TABLE `tblApiKeys` (
   `apikey` varchar(32) NOT NULL,
   `expires` datetime DEFAULT NULL,
   `disabled` smallint(1) NOT NULL DEFAULT '0',
-  CONSTRAINT `tblApiKeys_user` FOREIGN KEY (`user`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `apikey` (`apikey`),
+  CONSTRAINT `tblApiKeys_user` FOREIGN KEY (`user`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
index a116535d1..d25c1e6c6 100644
--- a/install/create_tables-postgres.sql
+++ b/install/create_tables-postgres.sql
@@ -93,7 +93,8 @@ CREATE TABLE "tblApiKeys" (
   "user" INTEGER DEFAULT NULL REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
   "apikey" varchar(32) NOT NULL,
   "expires" TIMESTAMP DEFAULT NULL
-  "disabled" INTEGER NOT NULL default '0'
+  "disabled" INTEGER NOT NULL default '0',
+  UNIQUE ("apikey")
 );
 
 -- --------------------------------------------------------
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index e15ba28b8..af6fbb73d 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -94,7 +94,8 @@ CREATE TABLE `tblApiKeys` (
   `user` INTEGER DEFAULT NULL REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
   `apikey` varchar(32) NOT NULL,
   `expires` TEXT NOT NULL
-  `disabled` INTEGER NOT NULL DEFAULT '0'
+  `disabled` INTEGER NOT NULL DEFAULT '0',
+  UNIQUE (`apikey`)
 );
 
 -- --------------------------------------------------------