diff --git a/db/zm_update-1.31.23.sql b/db/zm_update-1.31.23.sql
index 1e4b6795c..9482561df 100644
--- a/db/zm_update-1.31.23.sql
+++ b/db/zm_update-1.31.23.sql
@@ -2,7 +2,11 @@ SET @s = (SELECT IF(
     (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
       AND table_name = 'Servers'
       AND column_name = 'zmstats.pl'
-    ) > 0,
+    ) > 0 AND ( SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+      AND table_name = 'Servers'
+      AND column_name = 'zmstats'
+    ) = 0
+    ,
     "ALTER TABLE Servers CHANGE COLUMN `zmstats.pl` `zmstats` BOOLEAN NOT NULL DEFAULT FALSE",
     "SELECT 'zmstats.pl has already been changed to zmstats'"
     ));
@@ -13,8 +17,27 @@ EXECUTE stmt;
 SET @s = (SELECT IF(
     (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
       AND table_name = 'Servers'
-      AND column_name = 'zmaudit.pl'
+      AND column_name = 'zmstats.pl'
     ) > 0,
+    "ALTER TABLE Servers DROP COLUMN `zmstats.pl`",
+    "SELECT 'zmstats.pl has already been removed'"
+    ));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+      AND table_name = 'Servers'
+      AND column_name = 'zmaudit.pl'
+    ) > 0
+    AND 
+    ( SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+      AND table_name = 'Servers'
+      AND column_name = 'zmaudit'
+    ) = 0
+    ,
     "ALTER TABLE Servers CHANGE COLUMN `zmaudit.pl` `zmaudit` BOOLEAN NOT NULL DEFAULT FALSE",
     "SELECT 'zmaudit.pl has already been changed to zmaudit'"
     ));
@@ -25,11 +48,41 @@ EXECUTE stmt;
 SET @s = (SELECT IF(
     (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
       AND table_name = 'Servers'
-      AND column_name = 'zmtrigger.pl'
+      AND column_name = 'zmaudit.pl'
     ) > 0,
+    "ALTER TABLE Servers DROP COLUMN `zmaudit.pl`",
+    "SELECT 'zmaudit.pl has already been removed'"
+    ));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+      AND table_name = 'Servers'
+      AND column_name = 'zmtrigger.pl'
+    ) > 0
+    AND 
+    ( SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+      AND table_name = 'Servers'
+      AND column_name = 'zmtrigger'
+    ) = 0
+    ,
     "ALTER TABLE Servers CHANGE COLUMN `zmtrigger.pl` `zmtrigger` BOOLEAN NOT NULL DEFAULT FALSE",
     "SELECT 'zmtrigger.pl has already been changed to zmtrigger'"
     ));
 
 PREPARE stmt FROM @s;
 EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+      AND table_name = 'Servers'
+      AND column_name = 'zmtrigger.pl'
+    ) > 0,
+    "ALTER TABLE Servers DROP COLUMN `zmtrigger.pl`",
+    "SELECT 'zmtrigger.pl has already been removed'"
+    ));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;