diff --git a/public/upgrade.php b/public/upgrade.php
index 85cce607..1ebf5ed7 100644
--- a/public/upgrade.php
+++ b/public/upgrade.php
@@ -2064,13 +2064,12 @@ function upgrade_1846_mysql()
     db_query("ALTER TABLE $mailbox MODIFY maildir varchar(255)  COLLATE latin1_general_ci NOT NULL");
     db_query("ALTER TABLE $mailbox MODIFY local_part varchar(255)  COLLATE latin1_general_ci NOT NULL");
     db_query("ALTER TABLE $mailbox MODIFY domain varchar(255)  COLLATE latin1_general_ci NOT NULL");
+    db_query("ALTER TABLE $vacation_notification DROP CONSTRAINT vacation_notification_pkey");
     db_query("ALTER TABLE $vacation MODIFY domain varchar(255)  COLLATE latin1_general_ci NOT NULL");
     db_query("ALTER TABLE $vacation MODIFY email varchar(255)  COLLATE latin1_general_ci NOT NULL");
     db_query("ALTER TABLE $alias_domain MODIFY alias_domain varchar(255)  COLLATE latin1_general_ci NOT NULL DEFAULT ''");
     db_query("ALTER TABLE $alias_domain MODIFY target_domain varchar(255)  COLLATE latin1_general_ci NOT NULL DEFAULT ''");
 
-    db_query("ALTER TABLE $vacation_notification DROP CONSTRAINT vacation_notification_pkey");
     db_query("ALTER TABLE $vacation_notification MODIFY on_vacation VARCHAR(255) COLLATE latin1_general_ci NOT NULL");
-    db_query("ALTER TABLE $vacation MODIFY email VARCHAR(255) COLLATE latin1_general_ci NOT NULL");
     db_query("ALTER TABLE $vacation_notification ADD CONSTRAINT vacation_notification_pkey FOREIGN KEY (`on_vacation`) REFERENCES $vacation(email) ON DELETE CASCADE");
 }