diff --git a/import-custom-sql.sh b/import-custom-sql.sh
index 4965ca9a0..aafb09597 100644
--- a/import-custom-sql.sh
+++ b/import-custom-sql.sh
@@ -145,7 +145,7 @@ import_mythicplus_sql() {
                 WHEN EXISTS (SELECT 1 FROM creature_template WHERE entry = 900001)
                  AND EXISTS (SELECT 1 FROM item_template WHERE entry = 900100)
                  AND EXISTS (SELECT 1 FROM gameobject_template WHERE entry = 900000)
-                 AND EXISTS (SELECT 1 FROM creature WHERE id = 900001)
+                 AND EXISTS (SELECT 1 FROM creature WHERE id1 = 900001)
                  AND EXISTS (SELECT 1 FROM gameobject WHERE id = 900000)
                 THEN 1
                 ELSE 0
@@ -156,7 +156,7 @@ import_mythicplus_sql() {
         log "repairing MythicPlus world bootstrap entries"
         mysql_exec "acore_world" "
             DELETE FROM creature WHERE id = 900001;
-            DELETE FROM gameobject WHERE id = 900000;
+            DELETE FROM gameobject WHERE id1 = 900000;
             DELETE FROM creature_template_locale WHERE entry = 900001;
             DELETE FROM item_template_locale WHERE ID = 900100;
             DELETE FROM creature_template_model WHERE CreatureID = 900001;
@@ -280,24 +280,13 @@ import_playerbots_ru_sql() {
 }
 
 import_transmog_sql() {
+  log "Started importing Transmogrification SQL files"
+
   local account_transmog_sql="$ROOT_DIR/sql/Transmogrification/auth.sql"
   local character_transmog_sql="$ROOT_DIR/sql/Transmogrification/char.sql"
 
-  if table_exists "acore_world" "account_transmog"; then
-    log "account_transmog table already exists, skipping"
-  else
-    import_sql_file "acore_world" "$account_transmog_sql"
-
-    log "account_transmog table was successfully imported"
-  fi
-
-  if table_exists "acore_world" "character_transmog"; then
-    log "character_transmog table already exists, skipping"
-  else
-    import_sql_file "acore_world" "$character_transmog_sql"
-
-    log "account_character table was successfully imported"
-  fi
+  maybe_import_table "acore_auth" "account_transmog" "$account_transmog_sql"
+  maybe_import_table "acore_characters" "character_transmog" "$character_transmog_sql"
 }
 
 configure_server_motd() {