Improved password reset procedure