Final fixes for password reset behavior on sql_patches removal :)