diff --git a/conf/create-manager-db.sql b/conf/create-manager-db.sql
index 24bc2469b882faf8f465c8d4b3703e87b33f7d7b..f6d69beacc2ae871b2a7c4ea8b85df0e35dd18e7 100644
--- a/conf/create-manager-db.sql
+++ b/conf/create-manager-db.sql
@@ -1,12 +1,35 @@
-## Test IdP Account Manager DB creation script
+
+--
+-- Database: `idp_account_manager`
+--
+
+-- --------------------------------------------------------
+
+
+CREATE TABLE `authenticationtokens` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `token` varchar(50) NOT NULL,
+  `email_address` varchar(200) NOT NULL,
+  `sp_entityid` varchar(200) NOT NULL,
+  `creation_date` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `token_2` (`token`),
+  KEY `token` (`token`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+CREATE TABLE `serviceproviders` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `entityid` varchar(200) NOT NULL,
+  `displayname` varchar(500) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 CREATE TABLE `testaccounts` (
-  `id` bigint(20) NOT NULL auto_increment,
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `user_password_hash` varchar(50) NOT NULL,
-  `creation_date` int default NULL,
-  `expiration_date` int default NULL,
+  `creation_date` int(11) DEFAULT NULL,
+  `expiration_date` int(11) DEFAULT NULL,
   `account_profile` varchar(100) NOT NULL,
   `sp_entityid` varchar(250) NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 ;
-
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;