Index: branches/5.2.x/core/install/upgrades.sql
===================================================================
diff -u -N -r14469 -r14472
--- branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 14469)
+++ branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 14472)
@@ -2026,4 +2026,17 @@
 
 UPDATE PortalUser
 SET OldStyleLogin = 1
-WHERE (Login <> '') AND (Login NOT REGEXP '^[A-Z0-9_\\-\\.]+$');
\ No newline at end of file
+WHERE (Login <> '') AND (Login NOT REGEXP '^[A-Z0-9_\\-\\.]+$');
+
+DELETE FROM Events WHERE Event = 'USER.PSWD';
+
+UPDATE Phrase
+SET l<%PRIMARY_LANGUAGE%>_Translation = 'Your password has been reset.'
+WHERE PhraseKey = 'LU_TEXT_FORGOTPASSHASBEENRESET' AND l<%PRIMARY_LANGUAGE%>_Translation = 'Your password has been reset. The new password has been sent to your e-mail address. You may now login with the new password.';
+
+ALTER TABLE PortalUser
+	DROP MinPwResetDelay,
+	DROP PassResetTime,
+	CHANGE PwResetConfirm PwResetConfirm VARCHAR(255) NOT NULL;
+
+UPDATE PortalUser SET PwRequestTime = NULL WHERE PwRequestTime = 0;
\ No newline at end of file