diff --git a/install/mysql.sql b/install/mysql.sql
index adf78a7a..9109d61e 100644
--- a/install/mysql.sql
+++ b/install/mysql.sql
@@ -721,12 +721,11 @@ CREATE TABLE IF NOT EXISTS `vm_history` (
   `ip` varchar(256) NOT NULL,
   `date_start` datetime NOT NULL,
   `date_end` datetime DEFAULT NULL,
-  `login` varchar(256) NOT NULL,
+  `uid` int(10) unsigned NOT NULL,
   `serialized_object` TEXT NOT NULL,
-  `vm_id` int(10) unsigned NOT NULL,
   PRIMARY KEY (`id`),
   KEY `date_end` (`date_end`),
-  KEY `login` (`login`)
+  KEY `uid` (`uid`)
 ) ENGINE=MyISAM COMMENT='VM Allocation requests';
 
 
diff --git a/install/upgrades/3.1.0~a.sql b/install/upgrades/3.1.0~a.sql
index 807b5fe6..66504991 100644
--- a/install/upgrades/3.1.0~a.sql
+++ b/install/upgrades/3.1.0~a.sql
@@ -19,12 +19,11 @@ ALTER TABLE `ftpusers` ADD `enabled` boolean NOT NULL DEFAULT TRUE ;
 CREATE TABLE IF NOT EXISTS `vm_history` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `ip` varchar(256) NOT NULL,
-  `date_start` datetime NOT NULL,
+  `date_start` datetime NOT NULL, 
   `date_end` datetime DEFAULT NULL,
-  `login` varchar(256) NOT NULL,
+  `uid` int(10) unsigned NOT NULL,
   `serialized_object` TEXT NOT NULL,
-  `vm_id` int(10) unsigned NOT NULL,
   PRIMARY KEY (`id`),
   KEY `date_end` (`date_end`),
-  KEY `login` (`login`)
+  KEY `uid` (`uid`)
 ) ENGINE=MyISAM COMMENT='VM Allocation requests';