Improved Password Reset Functions