diff --git a/Database Updates/custom_nick_icons_setup.sql b/Database Updates/019_custom_nick_login_tokens_wired_message.sql
similarity index 71%
rename from Database Updates/custom_nick_icons_setup.sql
rename to Database Updates/019_custom_nick_login_tokens_wired_message.sql
index dbf9f81a..047ee571 100644
--- a/Database Updates/custom_nick_icons_setup.sql	
+++ b/Database Updates/019_custom_nick_login_tokens_wired_message.sql	
@@ -34,3 +34,18 @@ INSERT IGNORE INTO `custom_nick_icons_catalog` (`icon_key`, `display_name`, `poi
     ('6', 'Icon 6', 10, 0, 1, 6);
 ALTER TABLE `custom_nick_icons_catalog`
     ADD COLUMN IF NOT EXISTS `display_name` VARCHAR(100) NOT NULL DEFAULT '' AFTER `icon_key`;
+	
+ALTER TABLE `users`
+    ADD COLUMN IF NOT EXISTS `remember_token_hash` VARCHAR(64) NOT NULL DEFAULT '' AFTER `auth_ticket`;
+
+ALTER TABLE `users`
+    ADD COLUMN IF NOT EXISTS `remember_token_expires_at` INT(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `remember_token_hash`;
+
+ALTER TABLE `users`
+    ADD INDEX IF NOT EXISTS `idx_users_remember_token_hash` (`remember_token_hash`);
+
+
+INSERT INTO `wired_emulator_settings` (`key`, `value`, `comment`)
+VALUES ('hotel.wired.message.max_length', '512', 'Maximum length of text fields used by wired messages and bot text effects.')
+ON DUPLICATE KEY UPDATE `value` = '512';
+
diff --git a/Database Updates/remember_login_tokens.sql b/Database Updates/remember_login_tokens.sql
deleted file mode 100644
index 770ec27f..00000000
--- a/Database Updates/remember_login_tokens.sql	
+++ /dev/null
@@ -1,8 +0,0 @@
-ALTER TABLE `users`
-    ADD COLUMN IF NOT EXISTS `remember_token_hash` VARCHAR(64) NOT NULL DEFAULT '' AFTER `auth_ticket`;
-
-ALTER TABLE `users`
-    ADD COLUMN IF NOT EXISTS `remember_token_expires_at` INT(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `remember_token_hash`;
-
-ALTER TABLE `users`
-    ADD INDEX IF NOT EXISTS `idx_users_remember_token_hash` (`remember_token_hash`);
diff --git a/Database Updates/wired_message_length_512.sql b/Database Updates/wired_message_length_512.sql
deleted file mode 100644
index ad23b30f..00000000
--- a/Database Updates/wired_message_length_512.sql	
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO `wired_emulator_settings` (`key`, `value`, `comment`)
-VALUES ('hotel.wired.message.max_length', '512', 'Maximum length of text fields used by wired messages and bot text effects.')
-ON DUPLICATE KEY UPDATE `value` = '512';