Improve salt modification for PBKDF2