diff --git a/sql/old/7/auth/01_2018_02_19/2017_12_04_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_12_04_00_auth.sql
deleted file mode 100644
index 72725ea7a..000000000
--- a/sql/old/7/auth/01_2018_02_19/2017_12_04_00_auth.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE `realmlist` SET `gamebuild`=25549 WHERE `gamebuild`=25480;
-
-ALTER TABLE `realmlist` CHANGE `gamebuild` `gamebuild` int(10) unsigned NOT NULL DEFAULT '25549';
\ No newline at end of file
diff --git a/sql/old/7/auth/01_2018_02_19/2017_11_22_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_12_30_00_auth.sql
similarity index 61%
rename from sql/old/7/auth/01_2018_02_19/2017_11_22_00_auth.sql
rename to sql/old/7/auth/01_2018_02_19/2017_12_30_00_auth.sql
index fc6d1982b..593977703 100644
--- a/sql/old/7/auth/01_2018_02_19/2017_11_22_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_12_30_00_auth.sql
@@ -1,5 +1,5 @@
 ALTER TABLE `account` CHANGE `sessionkey` `sessionkey` varchar(128) NOT NULL DEFAULT '';
 
-UPDATE `realmlist` SET `gamebuild`=25480 WHERE `gamebuild`=24742;
+UPDATE `realmlist` SET `gamebuild`=25549 WHERE `gamebuild`=24742;
 
-ALTER TABLE `realmlist` CHANGE `gamebuild` `gamebuild` int(10) unsigned NOT NULL DEFAULT '25480';
\ No newline at end of file
+ALTER TABLE `realmlist` CHANGE `gamebuild` `gamebuild` int(10) unsigned NOT NULL DEFAULT '25549';
diff --git a/sql/old/7/auth/01_2018_02_19/2018_02_05_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2018_02_05_00_auth.sql
deleted file mode 100644
index c9b8fbdab..000000000
--- a/sql/old/7/auth/01_2018_02_19/2018_02_05_00_auth.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `account`
-  DROP `v`,
-  DROP `s`;
\ No newline at end of file
diff --git a/sql/old/7/hotfixes/01_2018_02_19/2017_11_22_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2017_11_18_00_hotfixes.sql
similarity index 99%
rename from sql/old/7/hotfixes/01_2018_02_19/2017_11_22_00_hotfixes.sql
rename to sql/old/7/hotfixes/01_2018_02_19/2017_11_18_00_hotfixes.sql
index 3bad2ce3e..334892a0d 100644
--- a/sql/old/7/hotfixes/01_2018_02_19/2017_11_22_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2017_11_18_00_hotfixes.sql
@@ -313,4 +313,4 @@ ALTER TABLE `world_map_area` MODIFY `Flags` int(10) UNSIGNED NOT NULL DEFAULT '0
 --
 -- Table structure for table `world_map_transforms`
 --
-ALTER TABLE `world_map_transforms` ADD `Priority` int(11) NOT NULL DEFAULT '0' AFTER `Flags`;
\ No newline at end of file
+ALTER TABLE `world_map_transforms` ADD `Priority` int(11) NOT NULL DEFAULT '0' AFTER `Flags`;
diff --git a/sql/old/7/world/01_2018_02_19/2018_02_19_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_02_19_00_world.sql
index 3db185854..7f44f654d 100644
--- a/sql/old/7/world/01_2018_02_19/2018_02_19_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_02_19_00_world.sql
@@ -1,33 +1,41 @@
 -- pretend the broken one doesnt exist
 DELETE FROM `updates` WHERE `name`='2018_02_08_00_world.sql';
 
-ALTER TABLE `guild_rewards` 
-  ADD `RaceMask_new` bigint(20) unsigned DEFAULT '0' AFTER `RaceMask`;
-UPDATE `guild_rewards` SET `RaceMask_new`=`RaceMask` WHERE `RaceMask`>=0;
+DROP PROCEDURE IF EXISTS fixup_2018_02_08_00_world;
 
-ALTER TABLE `guild_rewards`
-  DROP `RaceMask`,
-  CHANGE `RaceMask_new` `RaceMask` bigint(20) unsigned DEFAULT '0';
+DELIMITER ';;'
+CREATE PROCEDURE fixup_2018_02_08_00_world() begin
+    /* try to rerun a fixed version of the old update */
+    IF NOT EXISTS (SELECT * FROM `information_schema`.`columns` WHERE `table_schema`=SCHEMA() AND `table_name`='race_unlock_requirement' AND `column_name`='achievementId') THEN
+        ALTER TABLE `guild_rewards` ADD `RaceMask_new` bigint(20) unsigned DEFAULT '0' AFTER `RaceMask`;
+        UPDATE `guild_rewards` SET `RaceMask_new`=`RaceMask` WHERE `RaceMask`>=0;
+        ALTER TABLE `guild_rewards`
+          DROP `RaceMask`,
+          CHANGE `RaceMask_new` `RaceMask` bigint(20) unsigned DEFAULT '0';
 
-ALTER TABLE `playerchoice`
-  ADD `UiTextureKitId` int(11) NOT NULL DEFAULT '0' AFTER `ChoiceId`,
-  ADD `HideWarboardHeader` tinyint(1) NOT NULL DEFAULT '0' AFTER `Question`;
+        ALTER TABLE `playerchoice`
+          ADD `UiTextureKitId` int(11) NOT NULL DEFAULT '0' AFTER `ChoiceId`,
+          ADD `HideWarboardHeader` tinyint(1) NOT NULL DEFAULT '0' AFTER `Question`;
 
-ALTER TABLE `quest_poi` 
-  ADD `AlwaysAllowMergingBlobs` tinyint(1) unsigned NOT NULL DEFAULT '0' AFTER `WoDUnk1`;
+        ALTER TABLE `quest_poi` ADD `AlwaysAllowMergingBlobs` tinyint(1) unsigned NOT NULL DEFAULT '0' AFTER `WoDUnk1`;
 
-ALTER TABLE `quest_template`
-  ADD `MaxScalingLevel` int(11) NOT NULL DEFAULT '255' AFTER `QuestLevel`,
-  ADD `AllowableRaces_new` bigint(20) unsigned NOT NULL DEFAULT 0 AFTER `AllowableRaces`;
-UPDATE `quest_template` SET `AllowableRaces_new`=`AllowableRaces` WHERE `AllowableRaces`>=0;
+        ALTER TABLE `quest_template`
+          ADD `MaxScalingLevel` int(11) NOT NULL DEFAULT '255' AFTER `QuestLevel`,
+          ADD `AllowableRaces_new` bigint(20) unsigned NOT NULL DEFAULT 0 AFTER `AllowableRaces`;
+        UPDATE `quest_template` SET `AllowableRaces_new`=`AllowableRaces` WHERE `AllowableRaces`>=0;
+        ALTER TABLE `quest_template`
+          DROP `AllowableRaces`,
+          CHANGE `AllowableRaces_new` `AllowableRaces` bigint(20) unsigned DEFAULT '0';
 
-ALTER TABLE `quest_template`
-  DROP `AllowableRaces`,
-  CHANGE `AllowableRaces_new` `AllowableRaces` bigint(20) unsigned DEFAULT '0';
+        RENAME TABLE `race_expansion_requirement` TO `race_unlock_requirement`;
+        ALTER TABLE `race_unlock_requirement` ADD `achievementId` int(10) unsigned NOT NULL DEFAULT '0';
+    END IF;
+END;;
 
-RENAME TABLE `race_expansion_requirement` TO `race_unlock_requirement`;
-ALTER TABLE `race_unlock_requirement` 
-  ADD `achievementId` int(10) unsigned NOT NULL DEFAULT '0';
+DELIMITER ';'
+CALL fixup_2018_02_08_00_world();
+
+DROP PROCEDURE IF EXISTS fixup_2018_02_08_00_world;
 
 -- restore values broken by 2018_02_08_00_world if it did not cause an error during import
 UPDATE `guild_rewards` SET `RaceMask`=0xFFFFFFFF WHERE `ItemID` IN (62023,62024,62025,62026,62027,62029,63138,69209,69210,69888,85508,85509,85510,85666,89190,89191,89192,89193,89194,89195,116666);