Updated PasswordEncryptor