diff --git a/src/warden-server/doc/warden.mysql b/src/warden-server/doc/warden.mysql
index 3b862179b3d0b58e25d5d2c6b62066fec8a6c95c..509778b0f02b83d3bf004d7be4532330078d8b05 100644
--- a/src/warden-server/doc/warden.mysql
+++ b/src/warden-server/doc/warden.mysql
@@ -41,7 +41,7 @@ CREATE TABLE `clients` (
   `receive_own_events` varchar(1) default NULL,
   `description_tags` varchar(256) default NULL,
   `ip_net_client` varchar(256) default NULL,
-  `valid` varchar(1) DEFAULT NULL,
+  `valid` varchar(1) default 't',
   PRIMARY KEY  (`client_id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
@@ -66,8 +66,8 @@ CREATE TABLE `events` (
   `note` text,
   `priority` int(1) unsigned default NULL,
   `timeout` int(2) unsigned default NULL,
-  `valid` varchar(1) default NULL,
-  `client_id` int(11) DEFAULT NULL,
+  `valid` varchar(1) default 't',
+  `client_id` int(11) default NULL,
   PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
diff --git a/src/warden-server/doc/warden21to22.patch b/src/warden-server/doc/warden21to22.patch
index b4092c8100af04f9a246044506584183298f681b..2a4ef4e21c0fe41cf7ff5748d54562a0c4065081 100644
--- a/src/warden-server/doc/warden21to22.patch
+++ b/src/warden-server/doc/warden21to22.patch
@@ -1,7 +1,13 @@
-ALTER TABLE  `clients`
-ADD `valid` varchar(1) DEFAULT NULL;
+ALTER TABLE `clients`
+ADD `valid` varchar(1) DEFAULT 't';
 
-ALTER TABLE  `events`
-DROP COLUMN `hostname`,
-DROP COLUMN `service`,
+ALTER TABLE `events`
 ADD `client_id` int(11) DEFAULT NULL;
+
+UPDATE `events`, `clients`
+SET events.client_id = clients.client_id
+WHERE `events.hostname` = `clients.hostname` AND `events.service` = `clients.service`;
+
+ALTER TABLE `events`
+DROP COLUMN `hostname`,
+DROP COLUMN `service`;