PasswordSet fix